mirror of
https://github.com/hashicorp/vault.git
synced 2026-02-03 20:40:45 -05:00
* docker: build UBI containers on ubi10/minimal * add changelog Signed-off-by: Ryan Cragun <me@ryan.ec> Co-authored-by: Ryan Cragun <me@ryan.ec>
This commit is contained in:
parent
7b470708ac
commit
925676cc87
2 changed files with 4 additions and 3 deletions
|
|
@ -33,7 +33,6 @@ COPY ${LICENSE_SOURCE} ${LICENSE_DEST}
|
||||||
|
|
||||||
# Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
|
# Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
|
||||||
ENV NAME=$NAME
|
ENV NAME=$NAME
|
||||||
ENV VERSION=$VERSION
|
|
||||||
|
|
||||||
# Create a non-root user to run the software.
|
# Create a non-root user to run the software.
|
||||||
RUN addgroup ${NAME} && adduser -S -G ${NAME} ${NAME}
|
RUN addgroup ${NAME} && adduser -S -G ${NAME} ${NAME}
|
||||||
|
|
@ -79,7 +78,7 @@ CMD ["server", "-dev"]
|
||||||
|
|
||||||
|
|
||||||
## UBI DOCKERFILE ##
|
## UBI DOCKERFILE ##
|
||||||
FROM registry.access.redhat.com/ubi8/ubi-minimal AS ubi
|
FROM registry.access.redhat.com/ubi10/ubi-minimal AS ubi
|
||||||
|
|
||||||
ARG BIN_NAME
|
ARG BIN_NAME
|
||||||
# NAME and PRODUCT_VERSION are the name of the software in releases.hashicorp.com
|
# NAME and PRODUCT_VERSION are the name of the software in releases.hashicorp.com
|
||||||
|
|
@ -107,7 +106,6 @@ LABEL name="Vault" \
|
||||||
|
|
||||||
# Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
|
# Set ARGs as ENV so that they can be used in ENTRYPOINT/CMD
|
||||||
ENV NAME=$NAME
|
ENV NAME=$NAME
|
||||||
ENV VERSION=$VERSION
|
|
||||||
|
|
||||||
# Copy the license file as per Legal requirement
|
# Copy the license file as per Legal requirement
|
||||||
COPY ${LICENSE_SOURCE} ${LICENSE_DEST}/
|
COPY ${LICENSE_SOURCE} ${LICENSE_DEST}/
|
||||||
|
|
|
||||||
3
changelog/_11409.txt
Normal file
3
changelog/_11409.txt
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
```release-note:change
|
||||||
|
packaging: UBI container images are now built on the UBI 10 minimal image.
|
||||||
|
```
|
||||||
Loading…
Reference in a new issue