From d0a7a317bd084e30a067ce27d333337128518f0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20=C3=81lvaro?= <carlos@cdalvaro.io>
Date: Wed, 1 Apr 2020 22:38:59 +0200
Subject: [PATCH] feat: Upgrade SaltStack Master to 3000.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2eb6358..7ecca54 100644
--- a/CHANGELOG.md
+++ b/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/3000.html) for the list of changes in SaltStack.
+Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3000.1.html) for the list of changes in SaltStack.
+
+**3000.1**
+
+- Upgrade SaltStack Master to `3000.1`
+- Upgrade `libgit2` to version `1.0.0`
+- Upgrade `pygit2` to version `1.1.1`
 
 **3000_1**
 
diff --git a/Dockerfile b/Dockerfile
index 6e72a33..8a3cefc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3000" \
+ENV SALT_VERSION="3000.1" \
     PYTHON_VERSION="3.6" \
     LIBSSH2_VERSION="1.9.0" \
     LIBGIT2_VERSION="1.0.0" \
diff --git a/README.md b/README.md
index 0c69e81..24aa9a4 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# SaltStack Master v3000_1
+# SaltStack Master v3000.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:3000_1
+docker pull cdalvaro/saltstack-master:3000.1
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -73,7 +73,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:3000_1
+    cdalvaro/saltstack-master:3000.1
 ```
 
 ## Configuration
@@ -97,7 +97,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:3000_1
+    cdalvaro/saltstack-master:3000.1
 ```
 
 ### Master Signed Keys
@@ -111,7 +111,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:3000_1
+    cdalvaro/saltstack-master:3000.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).
@@ -137,7 +137,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:3000_1
+    cdalvaro/saltstack-master:3000.1
 ```
 
 ### Git Fileserver
@@ -193,7 +193,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:3000_1
+    cdalvaro/saltstack-master:3000.1
 ```
 
 Check [Available Configuration Parameters](#available-configuration-parameters) section for configuring logrotate.
@@ -239,7 +239,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:3000_1
+    cdalvaro/saltstack-master:3000.1
 ```
 
 ## Usage
diff --git a/VERSION b/VERSION
index 2f546cb..f2874f9 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3000_1
+3000.1
diff --git a/docker-compose.yml b/docker-compose.yml
index 3ea1d47..2f53858 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:3000_1
+    image: cdalvaro/saltstack-master:3000.1
     restart: always
     volumes:
       - "roots/:/home/salt/data/srv"