From 734676aea87b1e6913261177a22f227fe070cf14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20A=CC=81lvaro?= Date: Fri, 3 Mar 2023 19:00:10 +0100 Subject: [PATCH] feat: Change Docker base image to ubuntu:jammy-20230308 --- CHANGELOG.md | 4 ++++ Dockerfile | 5 ++--- README.md | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 634b840..24acfe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) for the list of changes in SaltStack. +**3006** + +- Change Docker base image to `ubuntu:jammy-20230308`. + **3005.1-2_1** - Fix: check GPG env variables before exiting if `gpgkeys` directory is empty. diff --git a/Dockerfile b/Dockerfile index 094e33a..c2cbde6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:jammy-20221101 +FROM ubuntu:jammy-20230308 ARG BUILD_DATE ARG VCS_REF @@ -71,8 +71,7 @@ LABEL org.opencontainers.image.vendor="cdalvaro" LABEL org.opencontainers.image.created="${BUILD_DATE}" LABEL org.opencontainers.image.version="${IMAGE_VERSION}" LABEL org.opencontainers.image.revision="${VCS_REF}" -LABEL org.opencontainers.image.base.digest="sha256:42ba2dfce475de1113d55602d40af18415897167d47c2045ec7b6d9746ff148f" -LABEL org.opencontainers.image.base.name="ubuntu:jammy-20221101" +LABEL org.opencontainers.image.base.name="ubuntu:jammy-20230308" LABEL org.opencontainers.image.licenses="MIT" WORKDIR ${SALT_HOME} diff --git a/README.md b/README.md index 5647f50..4189a0c 100644 --- a/README.md +++ b/README.md @@ -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" -[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"