Merge pull request #46 from cdalvaro/upgrade/v3002.1

Upgrade to v3002.1

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ The full log with the outputted error.
 **Version report (please complete the following information):**
  - OS: [e.g. `uname -a`]
  - Docker: [`docker --version`]
- - Image tag: [e.g. 3002]
+ - Image tag: [e.g. 3002.1]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/linter.yml

@@ -18,6 +18,7 @@ jobs:
       - name: Lint code base
         uses: github/super-linter@v3
         env:
+          VALIDATE_ALL_CODEBASE: false
           VALIDATE_DOCKERFILE_HADOLINT: true
           VALIDATE_BASH: true
           DEFAULT_BRANCH: master

CHANGELOG.md

@@ -1,7 +1,13 @@
 # Changelog
 
 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/3002.html) for the list of changes in SaltStack.
+Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.1.html) for the list of changes in SaltStack.
+
+**3002.1**
+
+- Upgrade `salt-master` to `3002.1` *Magnesium*
+- Change Docker base image to `ubuntu:focal-20201008`
+- Fix issue changing _read-only_ directories ownership ([@Kidswiss](https://github.com/Kidswiss) - [#47](https://github.com/cdalvaro/docker-salt-master/pull/47))
 
 **3002**
 

Dockerfile

@@ -1,10 +1,10 @@
-FROM ubuntu:focal-20200925
+FROM ubuntu:focal-20201008
 
 ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3002" \
+ENV SALT_VERSION="3002.1" \
     PYTHON_VERSION="3.8"
 
 ENV IMAGE_VERSION="${SALT_VERSION}"

README.md

@@ -6,7 +6,7 @@
 [![Docker Image Size][docker_size_badge]][docker_hub_tags]
 [![CodeFactor][codefactor_badge]][codefactor_score]
 
-# Dockerized SaltStack Master Magnesium v3002
+# Dockerized SaltStack Master Magnesium v3002.1
 
 Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.
 
@@ -44,7 +44,7 @@ For other methods to install SaltStack please refer to the [Official SaltStack I
 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:3002
+docker pull cdalvaro/docker-salt-master:3002.1
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -528,8 +528,8 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC
 - https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html
 - https://github.com/saltstack/salt/releases
 
-[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002-lightgrey.svg?style=flat-square&logo=Saltstack
-[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.html "SaltStack Release Notes"
+[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002.1-lightgrey.svg?style=flat-square&logo=Saltstack
+[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.1.html "SaltStack Release Notes"
 [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

VERSION

@@ -1 +1 @@
-3002
+3002.1

assets/runtime/functions.sh

@@ -208,8 +208,10 @@ function configure_salt_api()
   echo "Configuring salt-api service ..."
 
   CERTS_PATH=/etc/pki
+  SALT_API_KEY_FILE='docker-salt-master'
   rm -rf "${CERTS_PATH}/tls/certs/*"
-  salt-call --local tls.create_self_signed_cert cacert_path="${CERTS_PATH}" CN=docker-salt-master
+  salt-call --local tls.create_self_signed_cert cacert_path="${CERTS_PATH}" CN="${SALT_API_KEY_FILE}"
+  chown "${SALT_USER}": "${CERTS_PATH}/tls/certs/${SALT_API_KEY_FILE}".{crt,key}
 
   cat >> "${SALT_ROOT_DIR}/master" <<EOF
 
@@ -221,8 +223,8 @@ api_logfile: ${SALT_LOGS_DIR}/salt/api
 
 rest_cherrypy:
   port: 8000
-  ssl_crt: /etc/pki/tls/certs/docker-salt-master.crt
-  ssl_key: /etc/pki/tls/certs/docker-salt-master.key
+  ssl_crt: ${CERTS_PATH}/tls/certs/${SALT_API_KEY_FILE}.crt
+  ssl_key: ${CERTS_PATH}/tls/certs/${SALT_API_KEY_FILE}.key
 EOF
 
   # configure supervisord to start salt-api

docker-compose.yml

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