Move to using GHCR

GeyserMC · Sep 13, 2023 · 3cc31d5 · 3cc31d5
1 parent fc91f04
commit 3cc31d5
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 17 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/README.MD → README.md b/README.MD → README.md
@@ -4,14 +4,14 @@ 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`
 
 ### Geyser: Bungee + [Waterfall](https://papermc.io/)
 * Egg: `egg-waterfall--geyser--floodgate.json`
 
-## GeyserConnect
+### Geyser: Standalone + GeyserConnect
 * Egg: `egg-geyser-connect.json`
-* Container: [`docker-geyserconnect`](https://github.com/GeyserMC/pterodactyl-stuff/tree/docker-geyserconnect)
+* Container: Uses the geyser container and loads the extension in
diff --git a/egg-geyser-connect.json b/egg-geyser-connect.json
@@ -10,7 +10,7 @@
     "description": "GeyserConnect is an easy way for Bedrock Edition clients to connect to any Java Edition servers without having to run anything.",
     "features": null,
     "docker_images": {
-        "quay.io\/geysermc\/pterodactyl-stuff:docker-geyser": "quay.io\/geysermc\/pterodactyl-stuff:docker-geyser"
+        "ghcr.io\/geysermc\/pterodactyl-geyser:latest": "ghcr.io\/geysermc\/pterodactyl-geyser:latest"
     },
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",

diff --git a/egg-geyser-m-c.json b/egg-geyser-m-c.json
@@ -10,7 +10,7 @@
     "description": "Geyser is a bridge between Minecraft: Bedrock Edition and Minecraft: Java Edition, closing the gap from those wanting to play true cross-platform.",
     "features": null,
     "docker_images": {
-        "quay.io\/geysermc\/pterodactyl-stuff:docker-geyser": "quay.io\/geysermc\/pterodactyl-stuff:docker-geyser"
+        "ghcr.io\/geysermc\/pterodactyl-geyser:latest": "ghcr.io\/geysermc\/pterodactyl-geyser:latest"
     },
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -jar {{SERVER_JARFILE}}",

diff --git a/egg-paper--geyser--floodgate.json b/egg-paper--geyser--floodgate.json
@@ -13,9 +13,7 @@
     ],
     "docker_images": {
         "ghcr.io\/pterodactyl\/yolks:java_17": "ghcr.io\/pterodactyl\/yolks:java_17",
-        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16",
-        "quay.io\/pterodactyl\/yolks:java_11": "quay.io\/pterodactyl\/yolks:java_11",
-        "quay.io\/pterodactyl\/yolks:java_8": "quay.io\/pterodactyl\/yolks:java_8"
+        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16"
     },
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -Dterminal.jline=false -Dterminal.ansi=true -DgeyserUdpPort={{GEYSER_PORT}} -jar {{SERVER_JARFILE}}",

diff --git a/egg-velocity--geyser--floodgate.json b/egg-velocity--geyser--floodgate.json
@@ -11,9 +11,7 @@
     "features": null,
     "docker_images": {
         "ghcr.io\/pterodactyl\/yolks:java_17": "ghcr.io\/pterodactyl\/yolks:java_17",
-        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16",
-        "quay.io\/pterodactyl\/yolks:java_11": "quay.io\/pterodactyl\/yolks:java_11",
-        "quay.io\/pterodactyl\/yolks:java_8": "quay.io\/pterodactyl\/yolks:java_8"
+        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16"
     },
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -DgeyserUdpPort={{GEYSER_PORT}} -jar {{SERVER_JARFILE}}",

diff --git a/egg-velocity--geyser.json b/egg-velocity--geyser.json
@@ -11,9 +11,7 @@
     "features": null,
     "docker_images": {
         "ghcr.io\/pterodactyl\/yolks:java_17": "ghcr.io\/pterodactyl\/yolks:java_17",
-        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16",
-        "quay.io\/pterodactyl\/yolks:java_11": "quay.io\/pterodactyl\/yolks:java_11",
-        "quay.io\/pterodactyl\/yolks:java_8": "quay.io\/pterodactyl\/yolks:java_8"
+        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16"
     },
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -DgeyserUdpPort={{GEYSER_PORT}} -jar {{SERVER_JARFILE}}",

diff --git a/egg-waterfall--geyser--floodgate.json b/egg-waterfall--geyser--floodgate.json
@@ -11,9 +11,7 @@
     "features": null,
     "docker_images": {
         "ghcr.io\/pterodactyl\/yolks:java_17": "ghcr.io\/pterodactyl\/yolks:java_17",
-        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16",
-        "quay.io\/pterodactyl\/yolks:java_11": "quay.io\/pterodactyl\/yolks:java_11",
-        "quay.io\/pterodactyl\/yolks:java_8": "quay.io\/pterodactyl\/yolks:java_8"
+        "ghcr.io\/pterodactyl\/yolks:java_16": "ghcr.io\/pterodactyl\/yolks:java_16"
     },
     "file_denylist": [],
     "startup": "java -Xms128M -Xmx{{SERVER_MEMORY}}M -DgeyserUdpPort={{GEYSER_PORT}} -jar {{SERVER_JARFILE}}",

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