diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index b70ac9f1cf..d568099693 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -43,7 +43,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.16.5' + go-version: '1.17.5' - name: Checkout uses: actions/checkout@v2 with: @@ -60,4 +60,4 @@ jobs: - name: On Failure, Launch Debug Session if: ${{ failure() }} uses: mxschmitt/action-tmate@v3 - timeout-minutes: 5 \ No newline at end of file + timeout-minutes: 5 diff --git a/.github/workflows/unitcoverage.yaml b/.github/workflows/unitcoverage.yaml index a33104f4e6..f10eeb0697 100644 --- a/.github/workflows/unitcoverage.yaml +++ b/.github/workflows/unitcoverage.yaml @@ -29,7 +29,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: '1.16.5' + go-version: '1.17.5' - name: Checkout uses: actions/checkout@v2 with: diff --git a/Dockerfile.dapper b/Dockerfile.dapper index e92cbbaaac..529dd93fcb 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.16.10-alpine3.13 +ARG GOLANG=golang:1.17.5-alpine3.15 FROM ${GOLANG} ARG http_proxy=$http_proxy diff --git a/Dockerfile.manifest b/Dockerfile.manifest index 343ed87101..31defacf11 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.16.10-alpine3.13 +ARG GOLANG=golang:1.17.5-alpine3.15 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test.dapper b/Dockerfile.test.dapper index 801d76b8e1..f6e6affdb9 100644 --- a/Dockerfile.test.dapper +++ b/Dockerfile.test.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.16.10-alpine3.13 +ARG GOLANG=golang:1.17.5-alpine3.15 FROM ${GOLANG} RUN apk -U --no-cache add bash git gcc musl-dev docker curl jq coreutils python3 openssl py3-pip procps diff --git a/Dockerfile.test.mod.dapper b/Dockerfile.test.mod.dapper index 0584e958d8..57b665c356 100644 --- a/Dockerfile.test.mod.dapper +++ b/Dockerfile.test.mod.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.16.10-alpine3.13 +ARG GOLANG=golang:1.17.5-alpine3.15 FROM ${GOLANG} RUN apk -U --no-cache add bash jq diff --git a/package/Dockerfile b/package/Dockerfile index 2df56f703f..29aab5e818 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.12 as base +FROM alpine:3.15 as base RUN apk add -U ca-certificates tar zstd COPY build/out/data.tar.zst / RUN mkdir -p /image/etc/ssl/certs /image/run /image/var/run /image/tmp /image/lib/modules /image/lib/firmware && \