Skip to content

Commit 2dbabee

Browse files
sakai135sakai135
committed
update github actions
1 parent 3a81c9d commit 2dbabee

5 files changed

Lines changed: 54 additions & 26 deletions

File tree

‎.github/dependabot.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2
22
updates:
3-
- package-ecosystem: "gomod"
4-
directory: "/distro/npiperelay"
3+
- package-ecosystem: "docker"
4+
directory: "/distro"
55
schedule:
66
interval: "daily"
77

‎.github/workflows/distro.yml‎

Lines changed: 46 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,59 @@ env:
1111

1212
jobs:
1313
build:
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-latest
1515
permissions:
1616
checks: write
1717
steps:
18-
- uses: actions/checkout@v3
19-
20-
- name: Build
21-
run: |
22-
docker build -t $TAG_NAME -f ./distro/alpine.dockerfile --build-arg REF=$RUN_URL --build-arg VERSION=${GITHUB_REF#refs/tags/} .
18+
- uses: docker/setup-docker-action@v5
19+
with:
20+
daemon-config: |
21+
{
22+
"debug": true,
23+
"features": {
24+
"containerd-snapshotter": true
25+
}
26+
}
27+
- uses: docker/setup-qemu-action@v4
28+
- uses: docker/setup-buildx-action@v4
29+
- uses: actions/checkout@v7
2330

24-
- uses: anchore/scan-action@v3
31+
- uses: docker/build-push-action@v7
2532
with:
26-
image: ${{ env.TAG_NAME }}
33+
context: .
34+
file: ./distro/alpine.dockerfile
35+
platforms: linux/arm64,linux/amd64
36+
push: false
37+
load: true
38+
tags: ${{ env.TAG_NAME }}
39+
build-args: |
40+
REF=${{ env.RUN_URL }}
41+
VERSION=${GITHUB_REF#refs/tags/}
2742
28-
- name: Package
43+
# https://github.com/anchore/scan-action/issues/542
44+
# - uses: anchore/scan-action@v7
45+
# with:
46+
# image: ${{ env.TAG_NAME }}
47+
# output-format: table
48+
# fail-build: false
49+
50+
- name: Package amd64
51+
run: |
52+
CONTAINER_ID=$(docker create --platform linux/amd64 ${{ env.TAG_NAME }})
53+
docker export $CONTAINER_ID | gzip > wsl-vpnkit-amd64.tar.gz
54+
sha256sum wsl-vpnkit-amd64.tar.gz | tee wsl-vpnkit-amd64.tar.gz.sha256
55+
ls -la wsl-vpnkit-amd64.tar.gz
56+
- name: Package arm64
2957
run: |
30-
CONTAINER_ID=$(docker create $TAG_NAME)
31-
docker export $CONTAINER_ID | gzip > wsl-vpnkit.tar.gz
32-
sha256sum wsl-vpnkit.tar.gz | tee wsl-vpnkit.tar.gz.sha256
33-
ls -la wsl-vpnkit.tar.gz
58+
CONTAINER_ID=$(docker create --platform linux/arm64 ${{ env.TAG_NAME }})
59+
docker export $CONTAINER_ID | gzip > wsl-vpnkit-arm64.tar.gz
60+
sha256sum wsl-vpnkit-arm64.tar.gz | tee wsl-vpnkit-arm64.tar.gz.sha256
61+
ls -la wsl-vpnkit-arm64.tar.gz
3462
35-
- name: Artifacts
36-
uses: actions/upload-artifact@v3
63+
- uses: actions/upload-artifact@v7
3764
with:
38-
name: wsl-vpnkit
3965
path: |
40-
wsl-vpnkit.tar.gz
41-
wsl-vpnkit.tar.gz.sha256
66+
wsl-vpnkit-amd64.tar.gz
67+
wsl-vpnkit-amd64.tar.gz.sha256
68+
wsl-vpnkit-arm64.tar.gz
69+
wsl-vpnkit-arm64.tar.gz.sha256

‎distro/alpine.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM docker.io/library/golang:1.26.5 AS gvisor-tap-vsock-arm64
1+
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26.5 AS gvisor-tap-vsock-arm64
22
WORKDIR /app
33
RUN git clone --depth 1 --branch v0.8.9 https://github.com/containers/gvisor-tap-vsock.git . && \
44
GOARCH=arm64 make vm && \
55
wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvproxy-windows-arm64.exe && \
66
mv ./gvproxy-windows-arm64.exe ./bin/gvproxy-windows.exe && \
77
chmod +x ./bin/gvproxy-windows.exe ./bin/gvforwarder
88

9-
FROM docker.io/library/alpine:3.24.1 AS gvisor-tap-vsock
9+
FROM --platform=$BUILDPLATFORM docker.io/library/alpine:3.24.1 AS gvisor-tap-vsock
1010
WORKDIR /app/bin/amd64
1111
RUN wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvproxy-windows.exe && \
1212
wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvforwarder && \

‎distro/fedora.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM docker.io/library/golang:1.26.5 AS gvisor-tap-vsock-arm64
1+
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26.5 AS gvisor-tap-vsock-arm64
22
WORKDIR /app
33
RUN git clone --depth 1 --branch v0.8.9 https://github.com/containers/gvisor-tap-vsock.git . && \
44
GOARCH=arm64 make vm && \
55
wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvproxy-windows-arm64.exe && \
66
mv ./gvproxy-windows-arm64.exe ./bin/gvproxy-windows.exe && \
77
chmod +x ./bin/gvproxy-windows.exe ./bin/gvforwarder
88

9-
FROM docker.io/library/alpine:3.24.1 AS gvisor-tap-vsock
9+
FROM --platform=$BUILDPLATFORM docker.io/library/alpine:3.24.1 AS gvisor-tap-vsock
1010
WORKDIR /app/bin/amd64
1111
RUN wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvproxy-windows.exe && \
1212
wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvforwarder && \

‎distro/ubuntu.dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM docker.io/library/golang:1.26.5 AS gvisor-tap-vsock-arm64
1+
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.26.5 AS gvisor-tap-vsock-arm64
22
WORKDIR /app
33
RUN git clone --depth 1 --branch v0.8.9 https://github.com/containers/gvisor-tap-vsock.git . && \
44
GOARCH=arm64 make vm && \
55
wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvproxy-windows-arm64.exe && \
66
mv ./gvproxy-windows-arm64.exe ./bin/gvproxy-windows.exe && \
77
chmod +x ./bin/gvproxy-windows.exe ./bin/gvforwarder
88

9-
FROM docker.io/library/alpine:3.24.1 AS gvisor-tap-vsock
9+
FROM --platform=$BUILDPLATFORM docker.io/library/alpine:3.24.1 AS gvisor-tap-vsock
1010
WORKDIR /app/bin/amd64
1111
RUN wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvproxy-windows.exe && \
1212
wget https://github.com/containers/gvisor-tap-vsock/releases/download/v0.8.9/gvforwarder && \

0 commit comments

Comments
 (0)