Move to using GHCR

GeyserMC · Sep 13, 2023 · 4cda045 · 4cda045
1 parent f97f4f5
commit 4cda045
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 2 deletions.
diff --git a/.github/workflows/build-pterodactyl-geyser.yml 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
diff --git a/.github/workflows/build-pterodactyl-geyserconnect.yml 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
diff --git a/README.MD → README.md b/README.MD → 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 → pterodactyl-geyser/Dockerfile b/docker-geyser/Dockerfile → pterodactyl-geyser/Dockerfile
diff --git a/docker-geyser/README.MD → pterodactyl-geyser/README.MD b/docker-geyser/README.MD → pterodactyl-geyser/README.MD
diff --git a/docker-geyser/entrypoint.sh → pterodactyl-geyser/entrypoint.sh b/docker-geyser/entrypoint.sh → pterodactyl-geyser/entrypoint.sh
diff --git a/docker-geyserconnect/Dockerfile → pterodactyl-geyserconnect/Dockerfile b/docker-geyserconnect/Dockerfile → pterodactyl-geyserconnect/Dockerfile
diff --git a/docker-geyserconnect/README.MD → pterodactyl-geyserconnect/README.MD b/docker-geyserconnect/README.MD → pterodactyl-geyserconnect/README.MD
diff --git a/docker-geyserconnect/entrypoint.sh → pterodactyl-geyserconnect/entrypoint.sh b/docker-geyserconnect/entrypoint.sh → pterodactyl-geyserconnect/entrypoint.sh