Browse Source

Bump all alpine images to 3.16 (#6334)

Signed-off-by: Derek Nola <derek.nola@suse.com>
pull/6353/head
Derek Nola 2 years ago committed by GitHub
parent
commit
c0c9fa2954
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Dockerfile.dapper
  2. 2
      Dockerfile.manifest
  3. 2
      Dockerfile.test
  4. 2
      conformance/Dockerfile
  5. 2
      docs/release/kubernetes-upgrade.md
  6. 2
      package/Dockerfile

2
Dockerfile.dapper

@ -1,4 +1,4 @@
ARG GOLANG=golang:1.19.2-alpine3.15 ARG GOLANG=golang:1.19.2-alpine3.16
FROM ${GOLANG} FROM ${GOLANG}
ARG http_proxy=$http_proxy ARG http_proxy=$http_proxy

2
Dockerfile.manifest

@ -1,4 +1,4 @@
ARG GOLANG=golang:1.19.2-alpine3.15 ARG GOLANG=golang:1.19.2-alpine3.16
FROM ${GOLANG} FROM ${GOLANG}
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/ COPY --from=plugins/manifest:1.2.3 /bin/* /bin/

2
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 FROM ${GOLANG} as test-base
RUN apk -U --no-cache add bash jq RUN apk -U --no-cache add bash jq

2
conformance/Dockerfile

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.16
ENV SONOBUOY_VERSION 0.56.5 ENV SONOBUOY_VERSION 0.56.5
RUN apk add curl tar gzip 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 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

2
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. # 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 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 \ export BUILD_CONTAINER="FROM ${GOIMAGE}\n \
RUN apk add --no-cache \ RUN apk add --no-cache \

2
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 RUN apk add -U ca-certificates tar zstd
COPY build/out/data.tar.zst / 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 && \ RUN mkdir -p /image/etc/ssl/certs /image/run /image/var/run /image/tmp /image/lib/modules /image/lib/firmware && \

Loading…
Cancel
Save