diff --git a/CHANGELOG.md b/CHANGELOG.md index 99ea077..2a947ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ This file only reflects the changes that are made in this image. Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3001.1.html) for the list of changes in SaltStack. +**3002** + +- Change Docker base image to `ubuntu:focal-20200925` + **3001.1** - Upgrade SaltStack Master to `3001.1` *Sodium* diff --git a/Dockerfile b/Dockerfile index e7eea19..f9e453b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20200720 +FROM ubuntu:focal-20200925 ARG BUILD_DATE ARG VCS_REF diff --git a/README.md b/README.md index 22626f2..40c8ac9 100644 --- a/README.md +++ b/README.md @@ -529,7 +529,7 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC [saltstack_badge]: https://img.shields.io/badge/SaltStack-v3001.1-lightgrey.svg?style=flat-square&logo=Saltstack [saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3001.1.html "SaltStack Release Notes" -[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20200720-E95420.svg?style=flat-square&logo=Ubuntu +[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal---20200925-E95420.svg?style=flat-square&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?style=flat-square&label=build&logo=GitHub&logoColor=%23181717 [github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22