From 135f9cb970e132d0f9db395461ef9a1d13276ea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Wed, 23 Jun 2021 21:02:58 +0200 Subject: [PATCH 1/5] feat: Update .dockerignore --- .dockerignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.dockerignore b/.dockerignore index 692aa8f..0c79fa2 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,3 +4,6 @@ # Ignoring markdown files *.md + +# Ignoring social media +social/ From 276c9a0469041c1d4a492ff4944dc3b6580e12cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Wed, 23 Jun 2021 21:06:07 +0200 Subject: [PATCH 2/5] feat: Change Docker base image to ubuntu:focal-20210609 --- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a8f194..537bb2e 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 [Salt 3003 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.html) for the list of changes in SaltStack. +**3003.1** + +- Change Docker base image to `ubuntu:focal-20210609` + **3003** - Upgrade `salt-master` to `3003` *Aluminium* diff --git a/Dockerfile b/Dockerfile index 96688cf..541394c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20210325 +FROM ubuntu:focal-20210609 ARG BUILD_DATE ARG VCS_REF diff --git a/README.md b/README.md index abb12b9..0ef7370 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--20210325-E95420.svg?logo=Ubuntu +[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210609-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 From 6a4f217836d0fdb86679a0e89e8dd8210063ad02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Wed, 23 Jun 2021 21:11:38 +0200 Subject: [PATCH 3/5] enh: Remove duplicated package --- assets/build/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 7743a82..80813f4 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -31,7 +31,7 @@ echo "Installing python3 packages ..." DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \ python3-mako python3-pycryptodome python3-cherrypy3 python3-git python3-u-msgpack \ python3-redis python3-gnupg python3-mysqldb python3-dateutil python3-libnacl python3-openssl \ - python3-pygit2 python3-pycryptodome + python3-pygit2 pip3 install timelib==0.2.5 From bed4659bcf79d2ca6c53110f4bffe99d174b9710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Wed, 23 Jun 2021 21:15:25 +0200 Subject: [PATCH 4/5] feat: Upgrade salt-master to 3003.1 Aluminium --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CHANGELOG.md | 3 ++- Dockerfile | 2 +- README.md | 4 ++-- VERSION | 2 +- docker-compose.yml | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index ce748c7..6f2a009 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`] + - Image tag: [e.g. `3003.1`] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index 537bb2e..9d8895c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # Changelog This file only reflects the changes that are made in this image. -Please refer to the [Salt 3003 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.html) for the list of changes in SaltStack. +Please refer to the [Salt 3003.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3003.1.html) for the list of changes in SaltStack. **3003.1** +- Upgrade `salt-master` to `3003.1` *Aluminium* - Change Docker base image to `ubuntu:focal-20210609` **3003** diff --git a/Dockerfile b/Dockerfile index 541394c..8cd2cd7 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" \ +ENV SALT_VERSION="3003.1" \ PYTHON_VERSION="3.8" ENV IMAGE_VERSION="${SALT_VERSION}" diff --git a/README.md b/README.md index 0ef7370..96aa983 100644 --- a/README.md +++ b/README.md @@ -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 +docker pull cdalvaro/docker-salt-master:3003.1 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -578,7 +578,7 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC - https://docs.saltproject.io/en/latest/contents.html [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" +[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3003.1.html "Salt Project Release Notes" [ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210609-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 99dc2a0..59ac66b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3003 \ No newline at end of file +3003.1 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 39b994b..93eb735 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 + image: cdalvaro/docker-salt-master:3003.1 restart: always volumes: - "roots/:/home/salt/data/srv" From cf3d58b7026844032df22f13e7491585090b67a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Wed, 23 Jun 2021 21:25:13 +0200 Subject: [PATCH 5/5] fix: Add SC1091 shellcheck exception --- assets/build/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/build/install.sh b/assets/build/install.sh index 80813f4..668b194 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -2,6 +2,7 @@ set -e +# shellcheck disable=SC1091 source "${SALT_BUILD_DIR}/functions.sh" echo "Installing build dependencies ..."