From 8e1ae658c3b7e78da62ad6b50dad94418a633c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 21 Mar 2020 21:41:43 +0100 Subject: [PATCH] feat: Update image tag to 3000_1 --- README.md | 16 ++++++++-------- VERSION | 2 +- docker-compose.yml | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index da1333c..c9d83d0 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SaltStack Master v3000 +# 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 +docker pull cdalvaro/saltstack-master:3000_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:3000 + cdalvaro/saltstack-master:3000_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:3000 + cdalvaro/saltstack-master:3000_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:3000 + 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). @@ -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:3000 + cdalvaro/saltstack-master:3000_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:3000 + cdalvaro/saltstack-master:3000_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:3000 + cdalvaro/saltstack-master:3000_1 ``` ## Usage diff --git a/VERSION b/VERSION index 8da85a2..2f546cb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3000 \ No newline at end of file +3000_1 diff --git a/docker-compose.yml b/docker-compose.yml index e1f1f4e..3ea1d47 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 + image: cdalvaro/saltstack-master:3000_1 restart: always volumes: - "roots/:/home/salt/data/srv"