From 5f911224f9c801db571f3cd2232910871f5684ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos@cdalvaro.io>
Date: Sat, 23 Feb 2019 12:42:35 +0100
Subject: [PATCH] Upgrade salt to v2018.3.4

---
 Dockerfile         |  2 +-
 README.md          | 18 +++++++++---------
 VERSION            |  2 +-
 docker-compose.yml |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c1bfdfd..ee9fae1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="2018.3.3" \
+ENV SALT_VERSION="2018.3.4" \
     PYTHON_VERSION="3.5" \
     LIBSSH2_VERSION="1.8.0" \
     LIBGIT2_VERSION="0.27.7" \
diff --git a/README.md b/README.md
index 8f593b9..0c50199 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# SaltStack Master v2018.3.3
+# SaltStack Master v2018.3.4
 
 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:2018.3.3
+docker pull cdalvaro/saltstack-master:2018.3.4
 ```
 
 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:2018.3.3
+    cdalvaro/saltstack-master:2018.3.4
 ```
 
 ## 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:2018.3.3
+    cdalvaro/saltstack-master:2018.3.4
 ```
 
 ### 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:2018.3.3
+    cdalvaro/saltstack-master:2018.3.4
 ```
 
 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:2018.3.3 app:gen-signed-keys other_master_sign
+    cdalvaro/saltstack-master:2018.3.4 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:2018.3.3
+    cdalvaro/saltstack-master:2018.3.4
 ```
 
 ### Git Fileserver
@@ -186,7 +186,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:2018.3.3
+    cdalvaro/saltstack-master:2018.3.4
 
 Check [Available Configuration Parameters](#available-configuration-parameters) section for configuring logrotate.
 
@@ -231,7 +231,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:2018.3.3
+    cdalvaro/saltstack-master:2018.3.4
 ```
 
 ## Usage
diff --git a/VERSION b/VERSION
index 7ef9ef2..5f1fbee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2018.3.3
\ No newline at end of file
+2018.3.4
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 2611b08..7769673 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   master:
     container_name: salt_master
-    image: cdalvaro/saltstack-master:2018.3.3
+    image: cdalvaro/saltstack-master:2018.3.4
     restart: always
     volumes:
       - "roots/:/home/salt/data/srv"