Upgrade SaltStack Master to 2018.3.3
This commit is contained in:
@@ -3,6 +3,10 @@
|
|||||||
This file only reflects the changes that are made in this image.
|
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/2018.3.2.html) for the list of changes in SaltStack.
|
Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/develop/topics/releases/2018.3.2.html) for the list of changes in SaltStack.
|
||||||
|
|
||||||
|
**2018.3.3**
|
||||||
|
|
||||||
|
- Upgrade SaltStack Master to 2018.3.3
|
||||||
|
|
||||||
**2018.3.2**
|
**2018.3.2**
|
||||||
|
|
||||||
- First version: SaltStack Master 2018.3.2
|
- First version: SaltStack Master 2018.3.2
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ FROM ubuntu:18.04
|
|||||||
|
|
||||||
LABEL maintainer="carlos.alvaro@citelan.es"
|
LABEL maintainer="carlos.alvaro@citelan.es"
|
||||||
LABEL description="SaltStack master"
|
LABEL description="SaltStack master"
|
||||||
LABEL version="2018.3.2"
|
LABEL version="2018.3.3"
|
||||||
|
|
||||||
ENV SALT_DOCKER_DIR="/etc/docker-salt" \
|
ENV SALT_DOCKER_DIR="/etc/docker-salt" \
|
||||||
SALT_ROOT_DIR="/etc/salt" \
|
SALT_ROOT_DIR="/etc/salt" \
|
||||||
@@ -27,7 +27,7 @@ ENV SALT_BOOTSTRAP_OPTS='-M -N -X -U'
|
|||||||
|
|
||||||
# Release version to install
|
# Release version to install
|
||||||
# https://github.com/saltstack/salt/releases
|
# https://github.com/saltstack/salt/releases
|
||||||
ENV SALT_GIT_RELEASE="v2018.3.2"
|
ENV SALT_GIT_RELEASE="v2018.3.3"
|
||||||
|
|
||||||
# Set non interactive mode
|
# Set non interactive mode
|
||||||
ENV DEBIAN_FRONTEND=noninteractive
|
ENV DEBIAN_FRONTEND=noninteractive
|
||||||
|
|||||||
16
README.md
16
README.md
@@ -1,4 +1,4 @@
|
|||||||
# SaltStack Master v2018.3.2
|
# SaltStack Master v2018.3.3
|
||||||
|
|
||||||
Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.
|
Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform.
|
||||||
|
|
||||||
@@ -26,7 +26,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.
|
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
|
```sh
|
||||||
docker pull cdalvaro/saltstack-master:2018.3.2
|
docker pull cdalvaro/saltstack-master:2018.3.3
|
||||||
```
|
```
|
||||||
|
|
||||||
You can also pull the latest tag which is built from the repository HEAD
|
You can also pull the latest tag which is built from the repository HEAD
|
||||||
@@ -62,7 +62,7 @@ docker run --name salt_master --detach \
|
|||||||
--publish 4505:4505/tcp --publish 4506:4506/tcp \
|
--publish 4505:4505/tcp --publish 4506:4506/tcp \
|
||||||
--env 'SALT_LOG_LEVEL=info' \
|
--env 'SALT_LOG_LEVEL=info' \
|
||||||
--read-only --volume $(pwd)/srv/:/home/salt/data/srv/ \
|
--read-only --volume $(pwd)/srv/:/home/salt/data/srv/ \
|
||||||
cdalvaro/saltstack-master:2018.3.2
|
cdalvaro/saltstack-master:2018.3.3
|
||||||
```
|
```
|
||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
@@ -86,7 +86,7 @@ docker run --name salt_master -d \
|
|||||||
--env 'SALT_LOG_LEVEL=info' \
|
--env 'SALT_LOG_LEVEL=info' \
|
||||||
--volume $(pwd)/srv/:/home/salt/data/srv/ \
|
--volume $(pwd)/srv/:/home/salt/data/srv/ \
|
||||||
--volume $(pwd)/keys/:/home/salt/data/keys/ \
|
--volume $(pwd)/keys/:/home/salt/data/keys/ \
|
||||||
cdalvaro/saltstack-master:2018.3.2
|
cdalvaro/saltstack-master:2018.3.3
|
||||||
```
|
```
|
||||||
|
|
||||||
### Master Signed Keys
|
### Master Signed Keys
|
||||||
@@ -100,7 +100,7 @@ docker run --name salt_stack --detach \
|
|||||||
--env 'SALT_MASTER_SIGN_PUBKEY=True'
|
--env 'SALT_MASTER_SIGN_PUBKEY=True'
|
||||||
--volume $(pwd)/srv/:/home/salt/data/srv/ \
|
--volume $(pwd)/srv/:/home/salt/data/srv/ \
|
||||||
--volume $(pwd)/keys/:/home/salt/data/keys/ \
|
--volume $(pwd)/keys/:/home/salt/data/keys/ \
|
||||||
cdalvaro/saltstack-master:2018.3.2
|
cdalvaro/saltstack-master:2018.3.3
|
||||||
```
|
```
|
||||||
|
|
||||||
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).
|
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).
|
||||||
@@ -110,7 +110,7 @@ Additionally, you can generate new keys by executing the following command:
|
|||||||
```sh
|
```sh
|
||||||
docker run --name salt_stack -it --rm \
|
docker run --name salt_stack -it --rm \
|
||||||
--volume $(pwd)/keys/:/home/salt/data/keys/ \
|
--volume $(pwd)/keys/:/home/salt/data/keys/ \
|
||||||
cdalvaro/saltstack-master:2018.3.2 app:gen-signed-keys other_master_sign
|
cdalvaro/saltstack-master:2018.3.3 app:gen-signed-keys other_master_sign
|
||||||
```
|
```
|
||||||
|
|
||||||
The newly created keys will appear inside `keys/generated/other_master_sign` directory.
|
The newly created keys will appear inside `keys/generated/other_master_sign` directory.
|
||||||
@@ -125,7 +125,7 @@ Also the container processes seem to be executed as the host's user/group `1000`
|
|||||||
docker run --name salt_stack -it --rm \
|
docker run --name salt_stack -it --rm \
|
||||||
--env "USERMAP_UID=$(id -u)" --env "USERMAP_GID=$(id -g)" \
|
--env "USERMAP_UID=$(id -u)" --env "USERMAP_GID=$(id -g)" \
|
||||||
--volume $(pwd)/srv/:/home/salt/data/srv/ \
|
--volume $(pwd)/srv/:/home/salt/data/srv/ \
|
||||||
cdalvaro/saltstack-master:2018.3.2
|
cdalvaro/saltstack-master:2018.3.3
|
||||||
```
|
```
|
||||||
|
|
||||||
### Available Configuration Parameters
|
### Available Configuration Parameters
|
||||||
@@ -162,7 +162,7 @@ docker run --name salt_master -d \
|
|||||||
--env 'SALT_LOG_LEVEL=info' \
|
--env 'SALT_LOG_LEVEL=info' \
|
||||||
--read-only --volume $(pwd)/srv/:/home/salt/data/srv/ \
|
--read-only --volume $(pwd)/srv/:/home/salt/data/srv/ \
|
||||||
--volume $(pwd)/config/:/home/salt/data/config/ \
|
--volume $(pwd)/config/:/home/salt/data/config/ \
|
||||||
cdalvaro/saltstack-master:2018.3.2
|
cdalvaro/saltstack-master:2018.3.3
|
||||||
```
|
```
|
||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ version: '3'
|
|||||||
services:
|
services:
|
||||||
master:
|
master:
|
||||||
container_name: salt_master
|
container_name: salt_master
|
||||||
image: cdalvaro/saltstack-master:2018.3.2
|
image: cdalvaro/saltstack-master:2018.3.3
|
||||||
volumes:
|
volumes:
|
||||||
- "./srv/:/home/salt/data/srv"
|
- "./srv/:/home/salt/data/srv"
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
Reference in New Issue
Block a user