Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update docker images to alpine 3.16 and golang 1.18.4 #137

Merged
merged 2 commits into from
Jul 29, 2022
Merged

update docker images to alpine 3.16 and golang 1.18.4 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeaa2d8
update docker images to alpine 3.16
sakai135 Jul 29, 2022
bc61cb6
add workaround for https://github.com/Azure/container-scan/issues/146
sakai135 Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
6 changes: 3 additions & 3 deletions distro/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18.1-alpine3.15 as build
FROM golang:1.18.4-alpine3.16 as build
WORKDIR /app
COPY go.mod go.sum ./
RUN go mod download
Expand All @@ -8,7 +8,7 @@ RUN GOOS=windows go build -ldflags '-s -w -H=windowsgui' -o bin/wsl-gvproxy.exe
GOOS=linux CGO_ENABLED=0 go build -ldflags '-s -w' -o bin/wsl-vm ./cmd/vm && \
find ./bin -type f -exec sha256sum {} \;

FROM golang:1.18.1-alpine3.15 as licenses
FROM golang:1.18.4-alpine3.16 as licenses
RUN apk add --no-cache git && \
apk list --installed && \
go install github.com/google/go-licenses@v1.0.0
Expand All @@ -19,7 +19,7 @@ COPY pkg ./pkg
RUN go-licenses save ./cmd/gvproxy --save_path ./licenses/gvproxy && \
go-licenses save ./cmd/vm --save_path ./licenses/vm

FROM alpine:3.15.4
FROM alpine:3.16.1
RUN apk add --no-cache openrc iptables bind-tools && \
apk list --installed
ARG REF=https://example.com/
Expand Down