From 4cda0459d70da3b459011cfdfbba279030e3f0e9 Mon Sep 17 00:00:00 2001 From: rtm516 Date: Wed, 13 Sep 2023 16:00:12 +0100 Subject: [PATCH] Move to using GHCR --- .../workflows/build-pterodactyl-geyser.yml | 40 +++++++++++++++++++ .../build-pterodactyl-geyserconnect.yml | 40 +++++++++++++++++++ README.MD => README.md | 4 +- .../Dockerfile | 0 .../README.MD | 0 .../entrypoint.sh | 0 .../Dockerfile | 0 .../README.MD | 0 .../entrypoint.sh | 0 9 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/build-pterodactyl-geyser.yml create mode 100644 .github/workflows/build-pterodactyl-geyserconnect.yml rename README.MD => README.md (84%) rename {docker-geyser => pterodactyl-geyser}/Dockerfile (100%) rename {docker-geyser => pterodactyl-geyser}/README.MD (100%) rename {docker-geyser => pterodactyl-geyser}/entrypoint.sh (100%) rename {docker-geyserconnect => pterodactyl-geyserconnect}/Dockerfile (100%) rename {docker-geyserconnect => pterodactyl-geyserconnect}/README.MD (100%) rename {docker-geyserconnect => pterodactyl-geyserconnect}/entrypoint.sh (100%) diff --git a/.github/workflows/build-pterodactyl-geyser.yml b/.github/workflows/build-pterodactyl-geyser.yml new file mode 100644 index 0000000..c1e5513 --- /dev/null +++ b/.github/workflows/build-pterodactyl-geyser.yml @@ -0,0 +1,40 @@ +name: Build pterodactyl-geyser + +on: + workflow_dispatch: + push: + branches: + - 'master' + paths: + - 'pterodactyl-geyser/**' + - '!pterodactyl-geyser/README.md' + +env: + DOCKER_OWNER: ${{ github.repository_owner }} + DOCKER_CONTAINER: pterodactyl-geyser + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Fix Docker environment variables + run: | + # Make lowercase + echo "DOCKER_OWNER=$(echo $DOCKER_OWNER | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV + echo "DOCKER_CONTAINER=$(echo $DOCKER_CONTAINER | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV + + - name: Build the Docker image + run: | + docker build $DOCKER_CONTAINER/ --tag $DOCKER_CONTAINER:latest + docker tag $DOCKER_CONTAINER:latest ghcr.io/$DOCKER_OWNER/$DOCKER_CONTAINER:latest + + - name: Log in to registry + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin + + - name: Push to GHCR + run: | + docker push ghcr.io/$DOCKER_OWNER/$DOCKER_CONTAINER:latest \ No newline at end of file diff --git a/.github/workflows/build-pterodactyl-geyserconnect.yml b/.github/workflows/build-pterodactyl-geyserconnect.yml new file mode 100644 index 0000000..785a0ab --- /dev/null +++ b/.github/workflows/build-pterodactyl-geyserconnect.yml @@ -0,0 +1,40 @@ +name: Build pterodactyl-geyserconnect + +on: + workflow_dispatch: + push: + branches: + - 'master' + paths: + - 'pterodactyl-geyserconnect/**' + - '!pterodactyl-geyserconnect/README.md' + +env: + DOCKER_OWNER: ${{ github.repository_owner }} + DOCKER_CONTAINER: pterodactyl-geyserconnect + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Fix Docker environment variables + run: | + # Make lowercase + echo "DOCKER_OWNER=$(echo $DOCKER_OWNER | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV + echo "DOCKER_CONTAINER=$(echo $DOCKER_CONTAINER | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV + + - name: Build the Docker image + run: | + docker build $DOCKER_CONTAINER/ --tag $DOCKER_CONTAINER:latest + docker tag $DOCKER_CONTAINER:latest ghcr.io/$DOCKER_OWNER/$DOCKER_CONTAINER:latest + + - name: Log in to registry + run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin + + - name: Push to GHCR + run: | + docker push ghcr.io/$DOCKER_OWNER/$DOCKER_CONTAINER:latest \ No newline at end of file diff --git a/README.MD b/README.md similarity index 84% rename from README.MD rename to README.md index 53be5cf..8d1b99a 100644 --- a/README.MD +++ b/README.md @@ -4,7 +4,7 @@ This repo contains the eggs for GeyserMC and the docker images for auto update s ## Geyser ### Geyser: Standalone * Egg: `egg-geyser-m-c.json` -* Container: [`docker-geyser`](https://github.com/GeyserMC/pterodactyl-stuff/tree/docker-geyser) +* Container: [`docker-geyser`](https://github.com/GeyserMC/pterodactyl-stuff/pkgs/container/pterodactyl-geyser) ### Geyser: Spigot + [PaperMC](https://papermc.io/) * Egg: `egg-paper--geyser--floodgate.json` @@ -14,4 +14,4 @@ This repo contains the eggs for GeyserMC and the docker images for auto update s ## GeyserConnect * Egg: `egg-geyser-connect.json` -* Container: [`docker-geyserconnect`](https://github.com/GeyserMC/pterodactyl-stuff/tree/docker-geyserconnect) +* Container: [`docker-geyserconnect`](https://github.com/GeyserMC/pterodactyl-stuff/pkgs/container/pterodactyl-geyserconnect) diff --git a/docker-geyser/Dockerfile b/pterodactyl-geyser/Dockerfile similarity index 100% rename from docker-geyser/Dockerfile rename to pterodactyl-geyser/Dockerfile diff --git a/docker-geyser/README.MD b/pterodactyl-geyser/README.MD similarity index 100% rename from docker-geyser/README.MD rename to pterodactyl-geyser/README.MD diff --git a/docker-geyser/entrypoint.sh b/pterodactyl-geyser/entrypoint.sh similarity index 100% rename from docker-geyser/entrypoint.sh rename to pterodactyl-geyser/entrypoint.sh diff --git a/docker-geyserconnect/Dockerfile b/pterodactyl-geyserconnect/Dockerfile similarity index 100% rename from docker-geyserconnect/Dockerfile rename to pterodactyl-geyserconnect/Dockerfile diff --git a/docker-geyserconnect/README.MD b/pterodactyl-geyserconnect/README.MD similarity index 100% rename from docker-geyserconnect/README.MD rename to pterodactyl-geyserconnect/README.MD diff --git a/docker-geyserconnect/entrypoint.sh b/pterodactyl-geyserconnect/entrypoint.sh similarity index 100% rename from docker-geyserconnect/entrypoint.sh rename to pterodactyl-geyserconnect/entrypoint.sh