luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Backport of Bump Alpine to 3.18 into release/1.16.x (#17725) 

* backport of commit 189786c0232009b6232713e8fe98c50654e68b46

* backport of commit fceeebd3ae85db510a5cdcf0cd8288bbacf2f59e

---------

Co-authored-by: David Yu <dyu@hashicorp.com>
This commit is contained in:
hc-github-team-consul-core 2023-06-13 21:17:02 -04:00 committed by GitHub
parent 4b5156e0f6
commit 402b68ff68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/17719.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:security
Bump Dockerfile base image to `alpine:3.18`.
```

4
Dockerfile
View File

@ -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.17 as official FROM docker.mirror.hashicorp.services/alpine:3.18 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.17 as default FROM docker.mirror.hashicorp.services/alpine:3.18 as default
ARG PRODUCT_VERSION ARG PRODUCT_VERSION
ARG BIN_NAME ARG BIN_NAME