Upgrade salt to v2019.2.0
This commit is contained in:
@@ -4,7 +4,7 @@ ARG BUILD_DATE
|
||||
ARG VCS_REF
|
||||
|
||||
# https://github.com/saltstack/salt/releases
|
||||
ENV SALT_VERSION="2018.3.4" \
|
||||
ENV SALT_VERSION="2019.2.0" \
|
||||
PYTHON_VERSION="3.6" \
|
||||
LIBSSH2_VERSION="1.8.0" \
|
||||
LIBGIT2_VERSION="0.27.8" \
|
||||
|
||||
20
README.md
20
README.md
@@ -1,4 +1,4 @@
|
||||
# SaltStack Master v2018.3.4
|
||||
# SaltStack Master v2019.2.0
|
||||
|
||||
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.4
|
||||
docker pull cdalvaro/saltstack-master:2019.2.0
|
||||
```
|
||||
|
||||
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.4
|
||||
cdalvaro/saltstack-master:2019.2.0
|
||||
```
|
||||
|
||||
## 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.4
|
||||
cdalvaro/saltstack-master:2019.2.0
|
||||
```
|
||||
|
||||
### 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.4
|
||||
cdalvaro/saltstack-master:2019.2.0
|
||||
```
|
||||
|
||||
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.4 app:gen-signed-keys other_master_sign
|
||||
cdalvaro/saltstack-master:2019.2.0 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.4
|
||||
cdalvaro/saltstack-master:2019.2.0
|
||||
```
|
||||
|
||||
### Git Fileserver
|
||||
@@ -180,13 +180,15 @@ Salt logs are accessible by mounting the volume `/home/salt/data/logs/`.
|
||||
|
||||
Inside that directory you could find `supervisor/` logs and `salt/` logs:
|
||||
|
||||
```sh
|
||||
docker run --name salt_master --detach \
|
||||
--publish 4505:4505/tcp --publish 4506:4506/tcp \
|
||||
--env 'SALT_LOG_LEVEL=info' \
|
||||
--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.4
|
||||
cdalvaro/saltstack-master:2019.2.0
|
||||
```
|
||||
|
||||
Check [Available Configuration Parameters](#available-configuration-parameters) section for configuring logrotate.
|
||||
|
||||
@@ -231,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:2018.3.4
|
||||
cdalvaro/saltstack-master:2019.2.0
|
||||
```
|
||||
|
||||
## Usage
|
||||
|
||||
@@ -3,7 +3,7 @@ version: '3'
|
||||
services:
|
||||
master:
|
||||
container_name: salt_master
|
||||
image: cdalvaro/saltstack-master:2018.3.4
|
||||
image: cdalvaro/saltstack-master:2019.2.0
|
||||
restart: always
|
||||
volumes:
|
||||
- "roots/:/home/salt/data/srv"
|
||||
|
||||
Reference in New Issue
Block a user