Browse Source

security: update alpine base image to 3.20

pull/21729/head
Michael Zalimeni 2 months ago
parent
commit
4421ce1677
  1. 4
      Dockerfile
  2. 2
      test/integration/connect/envoy/Dockerfile-tcpdump
  3. 2
      test/integration/connect/envoy/helpers.bash

4
Dockerfile

@ -16,7 +16,7 @@
# Official docker image that includes binaries from releases.hashicorp.com. This # Official docker image that includes binaries from releases.hashicorp.com. This
# downloads the release from releases.hashicorp.com and therefore requires that # downloads the release from releases.hashicorp.com and therefore requires that
# the release is published before building the Docker image. # the release is published before building the Docker image.
FROM docker.mirror.hashicorp.services/alpine:3.19 as official FROM docker.mirror.hashicorp.services/alpine:3.20 as official
# This is the release of Consul to pull in. # This is the release of Consul to pull in.
ARG VERSION ARG VERSION
@ -112,7 +112,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"]
# Production docker image that uses CI built binaries. # Production docker image that uses CI built binaries.
# Remember, this image cannot be built locally. # Remember, this image cannot be built locally.
FROM docker.mirror.hashicorp.services/alpine:3.19 as default FROM docker.mirror.hashicorp.services/alpine:3.20 as default
ARG PRODUCT_VERSION ARG PRODUCT_VERSION
ARG BIN_NAME ARG BIN_NAME

2
test/integration/connect/envoy/Dockerfile-tcpdump

@ -1,4 +1,4 @@
FROM alpine:3.17 FROM alpine:3.20
RUN apk add --no-cache tcpdump RUN apk add --no-cache tcpdump
VOLUME [ "/data" ] VOLUME [ "/data" ]

2
test/integration/connect/envoy/helpers.bash

@ -652,7 +652,7 @@ function docker_consul_for_proxy_bootstrap {
function docker_wget { function docker_wget {
local DC=$1 local DC=$1
shift 1 shift 1
docker run --rm --network container:envoy_consul-${DC}_1 docker.mirror.hashicorp.services/alpine:3.17 wget "$@" docker run --rm --network container:envoy_consul-${DC}_1 docker.mirror.hashicorp.services/alpine:3.20 wget "$@"
} }
function docker_curl { function docker_curl {

Loading…
Cancel
Save