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/ 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 6a8f194..9d8895c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # 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 96688cf..8cd2cd7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM ubuntu:focal-20210325 +FROM ubuntu:focal-20210609 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 abb12b9..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,8 +578,8 @@ 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" -[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20210325-E95420.svg?logo=Ubuntu +[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 [github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22 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/assets/build/install.sh b/assets/build/install.sh index 7743a82..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 ..." @@ -31,7 +32,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 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"