upgrade actions and alpine version

zyclonite · Feb 16, 2025 · a6ffe6d · a6ffe6d
1 parent 8551038
commit a6ffe6d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
@@ -12,12 +12,11 @@ on:
 
 env:
   IMAGE_NAME: zerotier
-  STORAGE_DRIVER: overlay
 
 jobs:
   build:
     name: Build images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -60,16 +59,13 @@ jobs:
 
   push:
     name: Publish images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build
     environment: production
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
 
-      - name: Setup podman and buildah
-        uses: zyclonite/setup-podman@v1
-
       - name: Import images
         run: |
           podman load -i ./image-amd64/image.tar

diff --git a/.github/workflows/router.yml b/.github/workflows/router.yml
@@ -16,12 +16,11 @@ on:
 
 env:
   IMAGE_NAME: zerotier
-  STORAGE_DRIVER: overlay
 
 jobs:
   build:
     name: Build images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -69,16 +68,13 @@ jobs:
 
   push:
     name: Publish images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build
     environment: production
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
 
-      - name: Setup podman and buildah
-        uses: zyclonite/setup-podman@v1
-
       - name: Import images
         run: |
           podman load -i ./image-amd64-router/image.tar

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 ARG ALPINE_IMAGE=alpine
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 ARG ZT_COMMIT=185a3a2c76e6bf1b1c0415871f43076638eb007c
 ARG ZT_VERSION=1.14.2