Skip to content

Commit

Permalink
Upgrade Alpine image to 3.17 (#16358)
Browse files Browse the repository at this point in the history
  • Loading branch information
hashi-derek authored Feb 22, 2023
1 parent de17c7c commit 5309f68
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .changelog/16358.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
container: Upgrade container image to use to Alpine 3.17.
```
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/integration/connect/envoy/Dockerfile-tcpdump
Original file line number Diff line number Diff line change
@@ -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" ]
2 changes: 1 addition & 1 deletion test/integration/connect/envoy/helpers.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 5309f68

Please sign in to comment.