Merge pull request #105 from cdalvaro/upgrade/v3004

Upgrade to v3004

.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.3`]
+ - Image tag: [e.g. `3004`]
 
 **Additional context**
 Add any other context about the problem here.

CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
 
 This file only reflects the changes that are made in this image.
-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.
+Please refer to the [Salt 3004 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3004.html)
+for the list of changes in SaltStack.
+
+**3004**
+
+- Upgrade `salt-master` to `3004` *Silicon*
+- Change Docker base image to `ubuntu:focal-20211006`
 
 **3003.3**
 

Dockerfile

@@ -1,10 +1,10 @@
-FROM ubuntu:focal-20210827
+FROM ubuntu:focal-20211006
 
 ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3003.3" \
+ENV SALT_VERSION="3004" \
     PYTHON_VERSION="3.8"
 
 ENV IMAGE_VERSION="${SALT_VERSION}"
@@ -33,7 +33,7 @@ WORKDIR ${SALT_BUILD_DIR}
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \
     sudo ca-certificates apt-transport-https wget locales openssh-client \
-    python${PYTHON_VERSION} python${PYTHON_VERSION}-dev \
+    python${PYTHON_VERSION} python3-dev libpython3-dev \
     python3-pip python3-setuptools python3-wheel \
     supervisor logrotate git gettext-base tzdata \
  && DEBIAN_FRONTEND=noninteractive update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \

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.3 _Aluminium_
+# Dockerized Salt Master v3004 _Silicon_
 
 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.3
+docker pull cdalvaro/docker-salt-master:3004
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -577,9 +577,9 @@ 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.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--20210827-E95420.svg?logo=Ubuntu
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3004-lightgrey.svg?logo=Saltstack
+[saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3004.html "Salt Project Release Notes"
+[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20211006-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

VERSION

@@ -1 +1 @@
-3003.3
+3004

assets/build/install.sh

@@ -30,7 +30,7 @@ EOF
 # Install python3 packages
 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-mako python3-pycryptodome python3-cherrypy3 python3-git \
   python3-redis python3-gnupg python3-mysqldb python3-dateutil python3-libnacl python3-openssl \
   python3-pygit2
 

docker-compose.yml

@@ -3,7 +3,7 @@ version: '3'
 services:
   master:
     container_name: salt_master
-    image: cdalvaro/docker-salt-master:3003.3
+    image: cdalvaro/docker-salt-master:3004
     restart: always
     volumes:
       - "roots/:/home/salt/data/srv"