chaos/docker-salt-master
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Change Docker base image to ubuntu:jammy-20230308

Browse Source
This commit is contained in:
Carlos Álvaro
2023-03-03 19:00:10 +01:00
committed by Carlos D. Álvaro
parent 20709f90f6
commit 734676aea8
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -4,6 +4,10 @@ This file only reflects the changes that are made in this image.
Please refer to the [Salt 3005.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3005.1.html) Please refer to the [Salt 3005.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3005.1.html)
for the list of changes in SaltStack. for the list of changes in SaltStack.
**3006**
- Change Docker base image to `ubuntu:jammy-20230308`.
**3005.1-2_1** **3005.1-2_1**
- Fix: check GPG env variables before exiting if `gpgkeys` directory is empty. - Fix: check GPG env variables before exiting if `gpgkeys` directory is empty.

5
Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:jammy-20221101 FROM ubuntu:jammy-20230308
ARG BUILD_DATE ARG BUILD_DATE
ARG VCS_REF ARG VCS_REF
@@ -71,8 +71,7 @@ LABEL org.opencontainers.image.vendor="cdalvaro"
LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.created="${BUILD_DATE}"
LABEL org.opencontainers.image.version="${IMAGE_VERSION}" LABEL org.opencontainers.image.version="${IMAGE_VERSION}"
LABEL org.opencontainers.image.revision="${VCS_REF}" LABEL org.opencontainers.image.revision="${VCS_REF}"
LABEL org.opencontainers.image.base.digest="sha256:42ba2dfce475de1113d55602d40af18415897167d47c2045ec7b6d9746ff148f" LABEL org.opencontainers.image.base.name="ubuntu:jammy-20230308"
LABEL org.opencontainers.image.base.name="ubuntu:jammy-20221101"
LABEL org.opencontainers.image.licenses="MIT" LABEL org.opencontainers.image.licenses="MIT"
WORKDIR ${SALT_HOME} WORKDIR ${SALT_HOME}

2
README.md
View File

@@ -791,7 +791,7 @@ Many thanks to:
[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes" [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes"
[ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20221101-E95420.svg?logo=Ubuntu [ubuntu_badge]: https://img.shields.io/badge/ubuntu-jammy--20230308-E95420.svg?logo=Ubuntu
[ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image"