Upgrade Alpine image to 3.17 (#16358)
This commit is contained in:
parent
d500380169
commit
b0a97756bf
|
@ -0,0 +1,3 @@
|
|||
```release-note:improvement
|
||||
container: Upgrade container image to use to Alpine 3.17.
|
||||
```
|
|
@ -13,7 +13,7 @@
|
|||
# Official docker image that includes binaries from releases.hashicorp.com. This
|
||||
# downloads the release from releases.hashicorp.com and therefore requires that
|
||||
# the release is published before building the Docker image.
|
||||
FROM docker.mirror.hashicorp.services/alpine:3.15 as official
|
||||
FROM docker.mirror.hashicorp.services/alpine:3.17 as official
|
||||
|
||||
# This is the release of Consul to pull in.
|
||||
ARG VERSION
|
||||
|
@ -109,7 +109,7 @@ CMD ["agent", "-dev", "-client", "0.0.0.0"]
|
|||
|
||||
# Production docker image that uses CI built binaries.
|
||||
# Remember, this image cannot be built locally.
|
||||
FROM docker.mirror.hashicorp.services/alpine:3.15 as default
|
||||
FROM docker.mirror.hashicorp.services/alpine:3.17 as default
|
||||
|
||||
ARG PRODUCT_VERSION
|
||||
ARG BIN_NAME
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
FROM alpine:3.12
|
||||
FROM alpine:3.17
|
||||
|
||||
RUN apk add --no-cache tcpdump
|
||||
VOLUME [ "/data" ]
|
||||
|
||||
CMD [ "-w", "/data/all.pcap" ]
|
||||
ENTRYPOINT [ "/usr/sbin/tcpdump" ]
|
||||
ENTRYPOINT [ "/usr/bin/tcpdump" ]
|
||||
|
|
|
@ -584,7 +584,7 @@ function docker_consul_for_proxy_bootstrap {
|
|||
function docker_wget {
|
||||
local DC=$1
|
||||
shift 1
|
||||
docker run --rm --network container:envoy_consul-${DC}_1 docker.mirror.hashicorp.services/alpine:3.9 wget "$@"
|
||||
docker run --rm --network container:envoy_consul-${DC}_1 docker.mirror.hashicorp.services/alpine:3.17 wget "$@"
|
||||
}
|
||||
|
||||
function docker_curl {
|
||||
|
|
Loading…
Reference in New Issue