Merge pull request #15 from cdalvaro/upgrade/v2019.2.1

Upgrade to v2019.2.1

CHANGELOG.md

@@ -1,7 +1,14 @@
 # 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/develop/topics/releases/2019.2.0.html) for the list of changes in SaltStack.
+Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/2019.2.1.html) for the list of changes in SaltStack.
+
+**2019.2.1**
+
+- Upgrade SaltStack Master to `2019.2.1`
+- Change Docker base image to `ubuntu:bionic-20190912.1`
+- Upgrade `pygit2` to version `1.9.0`
+- Upgrade `m2crypto` to version `0.35.2`
 
 **2019.2.0**
 

Dockerfile

@@ -1,15 +1,15 @@
-FROM ubuntu:bionic-20190204
+FROM ubuntu:bionic-20190912.1
 
 ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="2019.2.0" \
+ENV SALT_VERSION="2019.2.1" \
     PYTHON_VERSION="3.6" \
-    LIBSSH2_VERSION="1.8.0" \
-    LIBGIT2_VERSION="0.27.8" \
-    PYGIT2_VERSION="0.27.2" \
-    M2CRYPTO_VERSION="0.31.0"
+    LIBSSH2_VERSION="1.9.0" \
+    LIBGIT2_VERSION="0.28.3" \
+    PYGIT2_VERSION="0.28.2" \
+    M2CRYPTO_VERSION="0.35.2"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \
     SALT_ROOT_DIR="/etc/salt" \
@@ -62,7 +62,7 @@ COPY entrypoint.sh /sbin/entrypoint.sh
 RUN chmod +x /sbin/entrypoint.sh
 
 LABEL \
-    maintainer="github@cdalvaro.io" \
+    maintainer="carlos@cdalvaro.io" \
     org.label-schema.vendor=cdalvaro \
     org.label-schema.name="SaltStack Master" \
     org.label-schema.version=${SALT_VERSION} \

README.md

@@ -1,4 +1,4 @@
-# SaltStack Master v2019.2.0
+# SaltStack Master v2019.2.1
 
 Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.
 
@@ -30,7 +30,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/saltstack-master/) and is the recommended method of installation.
 
 ```sh
-docker pull cdalvaro/saltstack-master:2019.2.0
+docker pull cdalvaro/saltstack-master:2019.2.1
 ```
 
 You can also pull the latest tag which is built from the repository HEAD
@@ -67,7 +67,7 @@ docker run --name salt_master --detach \
     --env 'SALT_LOG_LEVEL=info' \
     --volume $(pwd)/roots/:/home/salt/data/srv/ \
     --volume $(pwd)/keys/:/home/salt/data/keys/ \
-    cdalvaro/saltstack-master:2019.2.0
+    cdalvaro/saltstack-master:2019.2.1
 ```
 
 ## Configuration
@@ -91,7 +91,7 @@ docker run --name salt_master -d \
     --env 'SALT_LOG_LEVEL=info' \
     --volume $(pwd)/roots/:/home/salt/data/srv/ \
     --volume $(pwd)/keys/:/home/salt/data/keys/ \
-    cdalvaro/saltstack-master:2019.2.0
+    cdalvaro/saltstack-master:2019.2.1
 ```
 
 ### Master Signed Keys
@@ -105,7 +105,7 @@ docker run --name salt_stack --detach \
     --env 'SALT_MASTER_SIGN_PUBKEY=True'
     --volume $(pwd)/roots/:/home/salt/data/srv/ \
     --volume $(pwd)/keys/:/home/salt/data/keys/ \
-    cdalvaro/saltstack-master:2019.2.0
+    cdalvaro/saltstack-master:2019.2.1
 ```
 
 The container will create the `master_sign` key and its signature. More information about how to configure the minion service can be found [here](https://docs.saltstack.com/en/latest/topics/tutorials/multimaster_pki.html#prepping-the-minion-to-verify-received-public-keys).
@@ -115,7 +115,7 @@ Additionally, you can generate new keys by executing the following command:
 ```sh
 docker run --name salt_stack -it --rm \
     --volume $(pwd)/keys/:/home/salt/data/keys/ \
-    cdalvaro/saltstack-master:2019.2.0 app:gen-signed-keys other_master_sign
+    cdalvaro/saltstack-master:2019.2.1 app:gen-signed-keys other_master_sign
 ```
 
 The newly created keys will appear inside `keys/generated/other_master_sign` directory.
@@ -131,7 +131,7 @@ docker run --name salt_stack -it --rm \
     --env "USERMAP_UID=$(id -u)" --env "USERMAP_GID=$(id -g)" \
     --volume $(pwd)/roots/:/home/salt/data/srv/ \
     --volume $(pwd)/keys/:/home/salt/data/keys/ \
-    cdalvaro/saltstack-master:2019.2.0
+    cdalvaro/saltstack-master:2019.2.1
 ```
 
 ### Git Fileserver
@@ -187,7 +187,7 @@ docker run --name salt_master --detach \
     --volume $(pwd)/roots/:/home/salt/data/srv/ \
     --volume $(pwd)/keys/:/home/salt/data/keys/ \
     --volume $(pwd)/logs/:/home/salt/data/logs/ \
-    cdalvaro/saltstack-master:2019.2.0
+    cdalvaro/saltstack-master:2019.2.1
 ```
 
 Check [Available Configuration Parameters](#available-configuration-parameters) section for configuring logrotate.
@@ -233,7 +233,7 @@ docker run --name salt_master -d \
     --volume $(pwd)/roots/:/home/salt/data/srv/ \
     --volume $(pwd)/keys/:/home/salt/data/keys/ \
     --volume $(pwd)/config/:/home/salt/data/config/ \
-    cdalvaro/saltstack-master:2019.2.0
+    cdalvaro/saltstack-master:2019.2.1
 ```
 
 ## Usage

VERSION

@@ -1 +1 @@
-2019.2.0
+2019.2.1

docker-compose.yml

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

hooks/build

@@ -4,6 +4,6 @@
 # $IMAGE_NAME var is injected into the build so the tag is correct.
 
 docker build \
-		--build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
+        --build-arg=BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")" \
 		--build-arg=VCS_REF="$(git rev-parse --short HEAD)" \
-		-t ${IMAGE_NAME} .
+		-t ${IMAGE_NAME} .