From 9f0e8b229f56b8752e2371170b37597ba91f1829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Fri, 3 Sep 2021 16:14:25 +0200 Subject: [PATCH 1/2] feat: Upgrade salt-master to 3003.3 Aluminium --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CHANGELOG.md | 6 +++++- Dockerfile | 2 +- README.md | 8 ++++---- VERSION | 2 +- docker-compose.yml | 2 +- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 848bbe70..4ae076a8 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ The full log with the outputted error. **Version report (please complete the following information):** - Host OS: [e.g. `uname -a`] - Docker: [e.g. `docker --version`] - - Image tag: [e.g. `3003.2`] + - Image tag: [e.g. `3003.3`] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index b2b547ce..78face21 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,11 @@ # Changelog This file only reflects the changes that are made in this image. -Please refer to the [Salt 3003.2 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.2.html) for the list of changes in SaltStack. +Please refer to the [Salt 3003.3 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.3.html) for the list of changes in SaltStack. + +**3003.3** + +- Upgrade `salt-master` to `3003.3` *Aluminium* **3003.2** diff --git a/Dockerfile b/Dockerfile index f7f9947a..a296e7bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="3003.2" \ +ENV SALT_VERSION="3003.3" \ PYTHON_VERSION="3.8" ENV IMAGE_VERSION="${SALT_VERSION}" diff --git a/README.md b/README.md index 44cba76a..0c583768 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Architecture ARM64][arch_arm64_badge]][arch_link] [![Architecture ARM/v7][arch_arm_badge]][arch_link] -# Dockerized Salt Master v3003.2 _Aluminium_ +# Dockerized Salt Master v3003.3 _Aluminium_ Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform. @@ -46,7 +46,7 @@ For other methods to install `salt-master` please refer to the [Official Salt Pr Automated builds of the image are available on [Dockerhub](https://hub.docker.com/r/cdalvaro/docker-salt-master/) and is the recommended method of installation. ```sh -docker pull cdalvaro/docker-salt-master:3003.2 +docker pull cdalvaro/docker-salt-master:3003.3 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -577,8 +577,8 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC - https://docs.saltproject.io/en/getstarted/ - https://docs.saltproject.io/en/latest/contents.html -[saltproject_badge]: https://img.shields.io/badge/Salt-v3003.2-lightgrey.svg?logo=Saltstack -[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.2.html "Salt Project Release Notes" +[saltproject_badge]: https://img.shields.io/badge/Salt-v3003.3-lightgrey.svg?logo=Saltstack +[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.3.html "Salt Project Release Notes" [ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210723-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 diff --git a/VERSION b/VERSION index 084cb262..6260bd1c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3003.2 \ No newline at end of file +3003.3 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6980ed12..5a909cfe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: master: container_name: salt_master - image: cdalvaro/docker-salt-master:3003.2 + image: cdalvaro/docker-salt-master:3003.3 restart: always volumes: - "roots/:/home/salt/data/srv" From e33e5e198e612abc3d8afd71a10492df597f80ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Fri, 3 Sep 2021 16:16:12 +0200 Subject: [PATCH 2/2] feat: Change Docker base image to ubuntu:focal-20210827 --- CHANGELOG.md | 1 + Dockerfile | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78face21..511a78d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Please refer to the [Salt 3003.3 Release Notes](https://docs.saltstack.com/en/la **3003.3** - Upgrade `salt-master` to `3003.3` *Aluminium* +- Change Docker base image to `ubuntu:focal-20210827` **3003.2** diff --git a/Dockerfile b/Dockerfile index a296e7bb..7856230f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210723 +FROM ubuntu:focal-20210827 ARG BUILD_DATE ARG VCS_REF diff --git a/README.md b/README.md index 0c583768..d9b2f198 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.3-lightgrey.svg?logo=Saltstack [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.3.html "Salt Project Release Notes" -[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210723-E95420.svg?logo=Ubuntu +[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210827-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