From 831d916f5beef18f61cb55473d4dd9ca4ad4747c Mon Sep 17 00:00:00 2001 From: Keiichi Shimamura Date: Sat, 30 Jul 2022 00:00:07 -0400 Subject: [PATCH] update to alpine 3.16.1 (#141) * update to alpine 3.16.1 * add workaround for https://github.com/Azure/container-scan/issues/146 --- .github/workflows/ci.yml | 1 + distro/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 813acdb..30c22a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,6 +6,7 @@ on: env: TAG_NAME: ${{ format('wslvpnkit:{0}-{1}', github.sha, github.run_number) }} RUN_URL: ${{ format('{0}/{1}/actions/runs/{2}/attempts/{3}', github.server_url, github.repository, github.run_id, github.run_attempt) }} + DOCKLE_HOST: "unix:///var/run/docker.sock" # https://github.com/Azure/container-scan/issues/146 jobs: diff --git a/distro/Dockerfile b/distro/Dockerfile index c00e821..b1c96d1 100644 --- a/distro/Dockerfile +++ b/distro/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15.0 AS vpnkit +FROM alpine:3.16.1 AS vpnkit WORKDIR /files RUN wget https://github.com/sakai135/vpnkit/releases/download/v0.5.0-20211026/vpnkit-tap-vsockd && \ wget https://github.com/sakai135/vpnkit/releases/download/v0.5.0-20211026/vpnkit.exe && \ @@ -6,7 +6,7 @@ RUN wget https://github.com/sakai135/vpnkit/releases/download/v0.5.0-20211026/vp chmod +x vpnkit-tap-vsockd && \ find . -type f -exec sha256sum {} \; -FROM alpine:3.15.0 AS npiperelay +FROM alpine:3.16.1 AS npiperelay RUN apk add --no-cache p7zip && \ apk list --installed WORKDIR /files @@ -15,7 +15,7 @@ RUN wget https://github.com/jstarks/npiperelay/releases/download/v0.1.0/npiperel rm npiperelay_windows_amd64.zip && \ find . -type f -exec sha256sum {} \; -FROM alpine:3.15.0 +FROM alpine:3.16.1 RUN apk add --no-cache socat openrc iptables && \ apk list --installed ARG REF=https://example.com/