Skip to content

Commit a6ffe6d

Browse files
committed
upgrade actions and alpine version
1 parent 8551038 commit a6ffe6d

3 files changed

Lines changed: 5 additions & 13 deletions

File tree

.github/workflows/multiarch.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ on:
1212

1313
env:
1414
IMAGE_NAME: zerotier
15-
STORAGE_DRIVER: overlay
1615

1716
jobs:
1817
build:
1918
name: Build images
20-
runs-on: ubuntu-22.04
19+
runs-on: ubuntu-24.04
2120
strategy:
2221
fail-fast: false
2322
matrix:
@@ -60,16 +59,13 @@ jobs:
6059

6160
push:
6261
name: Publish images
63-
runs-on: ubuntu-22.04
62+
runs-on: ubuntu-24.04
6463
needs: build
6564
environment: production
6665
steps:
6766
- name: Download artifacts
6867
uses: actions/download-artifact@v4
6968

70-
- name: Setup podman and buildah
71-
uses: zyclonite/setup-podman@v1
72-
7369
- name: Import images
7470
run: |
7571
podman load -i ./image-amd64/image.tar

.github/workflows/router.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ on:
1616

1717
env:
1818
IMAGE_NAME: zerotier
19-
STORAGE_DRIVER: overlay
2019

2120
jobs:
2221
build:
2322
name: Build images
24-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2524
strategy:
2625
fail-fast: false
2726
matrix:
@@ -69,16 +68,13 @@ jobs:
6968

7069
push:
7170
name: Publish images
72-
runs-on: ubuntu-22.04
71+
runs-on: ubuntu-24.04
7372
needs: build
7473
environment: production
7574
steps:
7675
- name: Download artifacts
7776
uses: actions/download-artifact@v4
7877

79-
- name: Setup podman and buildah
80-
uses: zyclonite/setup-podman@v1
81-
8278
- name: Import images
8379
run: |
8480
podman load -i ./image-amd64-router/image.tar

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ALPINE_IMAGE=alpine
2-
ARG ALPINE_VERSION=3.20
2+
ARG ALPINE_VERSION=3.21
33
ARG ZT_COMMIT=185a3a2c76e6bf1b1c0415871f43076638eb007c
44
ARG ZT_VERSION=1.14.2
55

0 commit comments

Comments
 (0)