From 2502b4c355cc535371bc69d5b6da2eaa09d2f0ca Mon Sep 17 00:00:00 2001 From: Joshua Taylor Date: Thu, 11 Apr 2024 20:26:16 +0000 Subject: [PATCH] Update to get most templates to use some docker image --- .github/workflows/deploy.yml | 65 ------------------- factorio/factorio.json | 9 +++ fivem/fivem.json | 9 +++ minecraft-bedrock/minecraft-bedrock.json | 13 +++- .../minecraft-bungeecord.json | 4 +- minecraft-waterfall/minecraft-waterfall.json | 9 +++ pocketmine/pocketmine.json | 13 +++- teamspeak3/teamspeak3.json | 9 +++ terraria-tmodloader/terraria-tmodloader.json | 9 +++ terraria-tshock/terraria-tshock.json | 9 +++ terraria-vanilla/terraria-vanilla.json | 9 +++ tf2/Dockerfile | 10 --- tf2/tf2.json | 2 +- valheim/valheim.json | 14 +++- 14 files changed, 104 insertions(+), 80 deletions(-) delete mode 100644 .github/workflows/deploy.yml delete mode 100644 tf2/Dockerfile diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 048d9472..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,65 +0,0 @@ -name: Build Custom Images -on: - push: - paths: - - '**/Dockerfile' - schedule: - - cron: '0 11 * * *' - -concurrency: - group: ${{ github.event_name}}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build-docker-image-base: - runs-on: ubuntu-20.04 - name: "Build Docker images" - - strategy: - matrix: - include: - - image: tf2 - platform: linux/amd64 - file: tf2/Dockerfile - - permissions: - contents: read - packages: write - - environment: Release - - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} - - - name: Extract Docker metadata - id: meta - uses: docker/metadata-action@v5 - with: - images: | - name=pufferpanel/${{ matrix.image }} - tags: | - type=raw,value={{date 'YYYYMMDD-hhmmss'}} - type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'v3') }} - - - name: Check out code - uses: actions/checkout@v3 - - - name: Build and push Docker image - id: build-and-push - uses: docker/build-push-action@v5 - with: - context: . - file: ${{ matrix.file }} - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - platforms: ${{ matrix.platform }} diff --git a/factorio/factorio.json b/factorio/factorio.json index 604a211c..5da236e6 100644 --- a/factorio/factorio.json +++ b/factorio/factorio.json @@ -61,6 +61,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "pufferpanel/ubuntu" + } + ], "requirements": { "os": "linux", "arch": "amd64", diff --git a/fivem/fivem.json b/fivem/fivem.json index d1d333bd..bae3fa22 100644 --- a/fivem/fivem.json +++ b/fivem/fivem.json @@ -98,6 +98,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "pufferpanel/ubuntu" + } + ], "requirements": { "os": "linux", "arch": "amd64", diff --git a/minecraft-bedrock/minecraft-bedrock.json b/minecraft-bedrock/minecraft-bedrock.json index 8bac78d0..7cece816 100644 --- a/minecraft-bedrock/minecraft-bedrock.json +++ b/minecraft-bedrock/minecraft-bedrock.json @@ -151,7 +151,9 @@ "install": [ { "type": "download", - "files": "https://minecraft.azureedge.net/bin-linux/bedrock-server-${version}.zip" + "files": [ + "https://minecraft.azureedge.net/bin-linux/bedrock-server-${version}.zip" + ] }, { "type": "command", @@ -183,6 +185,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "pufferpanel/ubuntu" + } + ], "requirements": { "os": "linux", "arch": "amd64", diff --git a/minecraft-bungeecord/minecraft-bungeecord.json b/minecraft-bungeecord/minecraft-bungeecord.json index 1d6f689a..2fe1d9a7 100644 --- a/minecraft-bungeecord/minecraft-bungeecord.json +++ b/minecraft-bungeecord/minecraft-bungeecord.json @@ -44,7 +44,9 @@ }, { "type": "download", - "files": "http://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/BungeeCord.jar" + "files": [ + "http://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/BungeeCord.jar" + ] }, { "type": "writefile", diff --git a/minecraft-waterfall/minecraft-waterfall.json b/minecraft-waterfall/minecraft-waterfall.json index db3a62c4..fa2a3405 100644 --- a/minecraft-waterfall/minecraft-waterfall.json +++ b/minecraft-waterfall/minecraft-waterfall.json @@ -96,5 +96,14 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "eclipse-temurin:17" + } + ], "requirements": {} } diff --git a/pocketmine/pocketmine.json b/pocketmine/pocketmine.json index 224aa71e..f016a934 100644 --- a/pocketmine/pocketmine.json +++ b/pocketmine/pocketmine.json @@ -23,7 +23,9 @@ "install": [ { "type": "download", - "files": "https://raw.githubusercontent.com/pmmp/get.pmmp.io/stable/installer.sh" + "files": [ + "https://raw.githubusercontent.com/pmmp/get.pmmp.io/stable/installer.sh" + ] }, { "type": "command", @@ -51,6 +53,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "ubuntu" + } + ], "requirements": { "os": "linux", "arch": "amd64" diff --git a/teamspeak3/teamspeak3.json b/teamspeak3/teamspeak3.json index 672a19fc..de701b5d 100644 --- a/teamspeak3/teamspeak3.json +++ b/teamspeak3/teamspeak3.json @@ -97,6 +97,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "ubuntu" + } + ], "requirements": { "os": "linux", "arch": "amd64", diff --git a/terraria-tmodloader/terraria-tmodloader.json b/terraria-tmodloader/terraria-tmodloader.json index 03954b70..0d47b2ce 100644 --- a/terraria-tmodloader/terraria-tmodloader.json +++ b/terraria-tmodloader/terraria-tmodloader.json @@ -335,6 +335,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "pufferpanel/ubuntu" + } + ], "requirements": { "os": "linux", "arch": "amd64", diff --git a/terraria-tshock/terraria-tshock.json b/terraria-tshock/terraria-tshock.json index c0e90b33..db88699b 100644 --- a/terraria-tshock/terraria-tshock.json +++ b/terraria-tshock/terraria-tshock.json @@ -144,6 +144,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "pufferpanel/ubuntu" + } + ], "requirements": { "os": "linux", "binaries": [ diff --git a/terraria-vanilla/terraria-vanilla.json b/terraria-vanilla/terraria-vanilla.json index 7f033385..0b2d8e1d 100644 --- a/terraria-vanilla/terraria-vanilla.json +++ b/terraria-vanilla/terraria-vanilla.json @@ -292,6 +292,15 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "pufferpanel/ubuntu" + } + ], "requirements": { "os": "linux", "arch": "amd64", diff --git a/tf2/Dockerfile b/tf2/Dockerfile deleted file mode 100644 index 473e9b40..00000000 --- a/tf2/Dockerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM steamcmd/steamcmd - -ARG aptproxy="" -ENV DEBIAN_FRONTEND=noninteractive - -RUN if [ -n "${aptproxy}" ]; then echo "Acquire::http::Proxy \"http://${aptproxy}\";" > /etc/apt/apt.conf.d/00-apt-proxy; fi && \ - apt-get update && \ - apt-get install -y libtinfo5:i386 libncurses5:i386 libcurl3-gnutls:i386 && \ - apt-get clean && \ - rm -rf /var/cache/apt/archives \ No newline at end of file diff --git a/tf2/tf2.json b/tf2/tf2.json index b4965af4..5a3db25f 100644 --- a/tf2/tf2.json +++ b/tf2/tf2.json @@ -66,7 +66,7 @@ }, { "type": "docker", - "image": "pufferpanel/tf2" + "image": "pufferpanel/steamcmd" } ], "requirements": { diff --git a/valheim/valheim.json b/valheim/valheim.json index df39e0b3..b2b1d4f3 100644 --- a/valheim/valheim.json +++ b/valheim/valheim.json @@ -95,8 +95,20 @@ "environment": { "type": "host" }, + "supportedEnvironments": [ + { + "type": "host" + }, + { + "type": "docker", + "image": "steamcmd/steamcmd" + } + ], "requirements": { "os": "linux", - "arch": "amd64" + "arch": "amd64", + "binaries": [ + "unzip" + ] } } \ No newline at end of file