diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f5745d8..aebd72e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -9,25 +9,25 @@ jobs: name: Build and push images runs-on: debian-node-bullseye steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Install buildah run: | apt-get -y update apt-get -y install buildah podman - (echo '[storage]';echo 'driver = "vfs"') > /etc//containers/storage.conf + (echo '[storage]';echo 'driver = "vfs"') > /etc/containers/storage.conf - - name: Build Ubuntu 22.04 + - name: Build Ubuntu 26.04 id: build_ubuntu uses: redhat-actions/buildah-build@v2 env: BUILDAH_ISOLATION: chroot with: image: dev/actions-ubuntu - tags: '22.04' + tags: '26.04' containerfiles: | ubuntu.Containerfile - - name: Push Ubuntu 22.04 + - name: Push Ubuntu 26.04 uses: redhat-actions/push-to-registry@v2 with: image: ${{ steps.build_ubuntu.outputs.image }} @@ -35,22 +35,3 @@ jobs: registry: git.nul.ie username: dev password: ${{ secrets.PUSH_TOKEN }} - - - name: Build Minecraft - id: build_mc - uses: redhat-actions/buildah-build@v2 - env: - BUILDAH_ISOLATION: chroot - with: - image: dev/craftblock - tags: 2024.1.0-java17-alpine - containerfiles: | - craftblock.Containerfile - - name: Push Minecraft - uses: redhat-actions/push-to-registry@v2 - with: - image: ${{ steps.build_mc.outputs.image }} - tags: ${{ steps.build_mc.outputs.tags }} - registry: git.nul.ie - username: dev - password: ${{ secrets.PUSH_TOKEN }} diff --git a/craftblock.Containerfile b/craftblock.Containerfile deleted file mode 100644 index 8b8386c..0000000 --- a/craftblock.Containerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM ghcr.io/itzg/minecraft-server:2024.1.0-java17-alpine -RUN apk add --no-cache -U git-lfs openssh diff --git a/ubuntu.Containerfile b/ubuntu.Containerfile index c0644a4..cab1387 100644 --- a/ubuntu.Containerfile +++ b/ubuntu.Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/node:18-bullseye +FROM docker.io/node:24-trixie RUN apt-get -y update && \ apt-get -y install sudo jq buildah podman && \ - (echo '[storage]';echo 'driver = "vfs"') > /etc//containers/storage.conf + (echo '[storage]';echo 'driver = "vfs"') > /etc/containers/storage.conf