bump runner to 2.321.0 (#277)

some-natalie · Nov 15, 2024 · 5bc0284 · 5bc0284
1 parent b116b03
commit 5bc0284
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 19 deletions.
diff --git a/.github/workflows/test-wolfi.yml b/.github/workflows/test-wolfi.yml
@@ -30,23 +30,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Build the image
-        id: build-image
-        uses: redhat-actions/buildah-build@v2
-        with:
-          image: some-natalie/kubernoodles/wolfi
-          tags: test
-          containerfiles: images/wolfi.Dockerfile
-
-      - name: Push image
-        uses: redhat-actions/push-to-registry@v2
+      - name: Login to GHCR
+        uses: docker/login-action@v3
         with:
-          image: ${{ steps.build-image.outputs.image }}
-          tags: ${{ steps.build-image.outputs.tags }}
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          file: "images/wolfi.Dockerfile"
+          push: true
+          tags: ghcr.io/some-natalie/kubernoodles/wolfi:test
+
   deploy:
     name: Deploy test image to `test-runners` namespace
     runs-on: deploy-controller # use a self-hosted runner to deploy the image

diff --git a/images/rootless-ubuntu-jammy.Dockerfile b/images/rootless-ubuntu-jammy.Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 
 # GitHub runner arguments
-ARG RUNNER_VERSION=2.320.0
+ARG RUNNER_VERSION=2.321.0
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.2
 
 # Docker and Compose arguments

diff --git a/images/rootless-ubuntu-numbat.Dockerfile b/images/rootless-ubuntu-numbat.Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:24.04
 
 # GitHub runner arguments
-ARG RUNNER_VERSION=2.320.0
+ARG RUNNER_VERSION=2.321.0
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.2
 
 # Docker and Compose arguments

diff --git a/images/ubi8.Dockerfile b/images/ubi8.Dockerfile
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation="https://github.com/some-natalie/ku
 
 # Arguments
 ARG TARGETPLATFORM
-ARG RUNNER_VERSION=2.320.0
+ARG RUNNER_VERSION=2.321.0
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.2
 
 # Shell setup

diff --git a/images/ubi9.Dockerfile b/images/ubi9.Dockerfile
@@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation="https://github.com/some-natalie/ku
 
 # Arguments
 ARG TARGETPLATFORM
-ARG RUNNER_VERSION=2.320.0
+ARG RUNNER_VERSION=2.321.0
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.2
 
 # Shell setup

diff --git a/images/wolfi.Dockerfile b/images/wolfi.Dockerfile
@@ -10,9 +10,9 @@ LABEL org.opencontainers.image.documentation="https://github.com/some-natalie/ku
 
 # Arguments
 ARG TARGETPLATFORM
-ARG RUNNER_VERSION=2.320.0
+ARG RUNNER_VERSION=2.321.0
 ARG RUNNER_CONTAINER_HOOKS_VERSION=0.6.2
-ARG DOTNET_VERSION=7
+ARG DOTNET_VERSION=8
 
 # Set up the non-root user (runner)
 RUN addgroup -S runner && adduser -S runner -G runner
@@ -62,7 +62,6 @@ RUN export ARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) \
   && rm runner.tar.gz
 
 # remove bundled nodejs and symlink to system nodejs
-RUN rm /home/runner/externals/node16/bin/node && ln -s /usr/bin/node /home/runner/externals/node16/bin/node
 RUN rm /home/runner/externals/node20/bin/node && ln -s /usr/bin/node /home/runner/externals/node20/bin/node
 
 # Install container hooks