From c5ef46a71a2dfd94a16a6c29b00138a424cb1999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Fri, 26 Mar 2021 18:04:35 +0100 Subject: [PATCH] feat: Change Docker base image to ubuntu:focal-20210325 --- CHANGELOG.md | 2 +- Dockerfile | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index efceea4..6a8f194 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ Please refer to the [Salt 3003 Release Notes](https://docs.saltstack.com/en/late - Upgrade `salt-master` to `3003` *Aluminium* - Add python3 `timelib` `0.2.5` -- Change Docker base image to `ubuntu:focal-20210217` +- Change Docker base image to `ubuntu:focal-20210325` - Replace `m2crypto` by `pycryptodome` (see [saltstack/salt#56625](https://github.com/saltstack/salt/pull/56625)) **3002.6** diff --git a/Dockerfile b/Dockerfile index 3c3b9e2..0de4543 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210217 +FROM ubuntu:focal-20210325 ARG BUILD_DATE ARG VCS_REF diff --git a/README.md b/README.md index ec7b15d..abb12b9 100644 --- a/README.md +++ b/README.md @@ -579,7 +579,7 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC [saltproject_badge]: https://img.shields.io/badge/Salt-v3003-lightgrey.svg?logo=Saltstack [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.html "Salt Project Release Notes" -[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210217-E95420.svg?logo=Ubuntu +[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210325-E95420.svg?logo=Ubuntu [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" [github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?label=build&logo=GitHub&logoColor=%23181717 [github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22