diff --git a/Dockerfile.dapper b/Dockerfile.dapper index e70dfc6ba4..0c7ec90fc7 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.2-alpine3.15 +ARG GOLANG=golang:1.19.2-alpine3.16 FROM ${GOLANG} ARG http_proxy=$http_proxy diff --git a/Dockerfile.manifest b/Dockerfile.manifest index b8b64b40f7..8f54164723 100644 --- a/Dockerfile.manifest +++ b/Dockerfile.manifest @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.2-alpine3.15 +ARG GOLANG=golang:1.19.2-alpine3.16 FROM ${GOLANG} COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ diff --git a/Dockerfile.test b/Dockerfile.test index 8c8e1b0844..c89a7d8ed2 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -1,4 +1,4 @@ -ARG GOLANG=golang:1.19.2-alpine3.15 +ARG GOLANG=golang:1.19.2-alpine3.16 FROM ${GOLANG} as test-base RUN apk -U --no-cache add bash jq diff --git a/conformance/Dockerfile b/conformance/Dockerfile index 77244a5c03..2e8c0f0db5 100644 --- a/conformance/Dockerfile +++ b/conformance/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 +FROM alpine:3.16 ENV SONOBUOY_VERSION 0.56.5 RUN apk add curl tar gzip RUN curl -sfL https://github.com/vmware-tanzu/sonobuoy/releases/download/v${SONOBUOY_VERSION}/sonobuoy_${SONOBUOY_VERSION}_linux_amd64.tar.gz | tar xvzf - -C /usr/bin diff --git a/docs/release/kubernetes-upgrade.md b/docs/release/kubernetes-upgrade.md index 4999a7dd01..8c1757c2bc 100644 --- a/docs/release/kubernetes-upgrade.md +++ b/docs/release/kubernetes-upgrade.md @@ -50,7 +50,7 @@ git rebase --onto ${NEW_K8S} ${OLD_K8S} ${OLD_K3S_VER}~1 # This command is not backwards compatible and requires versions of yq greater than 4.0, as the query syntax has changed throughout the history of the project. export GOVERSION=$(yq -e '.dependencies[] | select(.name == "golang: upstream version").version' build/dependencies.yaml) -export GOIMAGE="golang:${GOVERSION}-alpine3.15" +export GOIMAGE="golang:${GOVERSION}-alpine3.16" export BUILD_CONTAINER="FROM ${GOIMAGE}\n \ RUN apk add --no-cache \ diff --git a/package/Dockerfile b/package/Dockerfile index 29aab5e818..362507b526 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 as base +FROM alpine:3.16 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 && \