From 50efd6577c90abe9468a528ed3662ab68025c88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Tue, 11 Feb 2020 18:48:43 +0100 Subject: [PATCH 1/5] feat: Change packages installation order --- assets/build/install.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index cc1753d..9f495a0 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -38,6 +38,17 @@ cd libgit2-${LIBGIT2_VERSION}/ cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBUILD_CLAR=OFF -DTHREADSAFE=ON . cmake --build . --target install +# Install python3 packages +echo "Installing python3 packages ..." +DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \ +python3-mako python3-pycryptodome python3-cherrypy3 python3-git python3-u-msgpack \ +python3-redis python3-gnupg python3-mysqldb python3-dateutil python3-libnacl + +# Install pip3 python packages +echo "Installing pip3 python packages ..." +pip3 install "pygit2==v${PYGIT2_VERSION}" \ + "M2Crypto==v${M2CRYPTO_VERSION}" + # Bootstrap script options: # https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html#command-line-options ## -M: install Salt Master by default @@ -52,18 +63,6 @@ wget -O bootstrap-salt.sh https://bootstrap.saltstack.com sh bootstrap-salt.sh ${SALT_BOOTSTRAP_OPTS} git v${SALT_VERSION} chown -R ${SALT_USER}: ${SALT_ROOT_DIR} -# Install python3 packages -echo "Installing python3 packages ..." -DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \ -python3-mako python3-pycryptodome python3-cherrypy3 python3-git python3-u-msgpack \ -python3-ioflo python3-redis python3-gnupg python3-mysqldb python3-dateutil python3-timelib \ -python3-raet python3-libnacl - -# Install pip3 python packages -echo "Installing pip3 python packages ..." -pip3 install "pygit2==v${PYGIT2_VERSION}" \ - "M2Crypto==v${M2CRYPTO_VERSION}" - # Configure ssh echo "Configuring ssh ..." sed -i -e "s|^[# ]*StrictHostKeyChecking.*$| StrictHostKeyChecking no|" /etc/ssh/ssh_config From 05360fee44e58ec369c592c742c3002b2f0030b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Tue, 11 Feb 2020 18:49:02 +0100 Subject: [PATCH 2/5] feat: Upgrade pygit2 to version 1.0.3 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5273e6c..97f7be4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ENV SALT_VERSION="2019.2.3" \ PYTHON_VERSION="3.6" \ LIBSSH2_VERSION="1.9.0" \ LIBGIT2_VERSION="0.28.4" \ - PYGIT2_VERSION="1.0.2" \ + PYGIT2_VERSION="1.0.3" \ M2CRYPTO_VERSION="0.35.2" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ From 4435b0a037bf83b47c175f53d85a973b7058ec33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Tue, 11 Feb 2020 18:49:16 +0100 Subject: [PATCH 3/5] feat: Change Docker base image to ubuntu:bionic-20200112 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 97f7be4..2987fef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20191202 +FROM ubuntu:bionic-20200112 ARG BUILD_DATE ARG VCS_REF From f28247afd762080f683614b54825822bf93d68fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Tue, 11 Feb 2020 18:49:55 +0100 Subject: [PATCH 4/5] feat: Upgrade SaltStack Master to 3000 Neon --- CHANGELOG.md | 8 +++++++- Dockerfile | 2 +- README.md | 18 +++++++++--------- VERSION | 2 +- docker-compose.yml | 2 +- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ba9e7e..49931a7 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/2019.2.3.html) for the list of changes in SaltStack. +Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3000.html) for the list of changes in SaltStack. + +**3000** + +- Upgrade SaltStack Master to `3000` *Neon* +- Change Docker base image to `ubuntu:bionic-20200112` +- Upgrade pygit2 to version `1.0.3` **2019.2.3** diff --git a/Dockerfile b/Dockerfile index 2987fef..dae2b9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="2019.2.3" \ +ENV SALT_VERSION="3000" \ PYTHON_VERSION="3.6" \ LIBSSH2_VERSION="1.9.0" \ LIBGIT2_VERSION="0.28.4" \ diff --git a/README.md b/README.md index 61a8407..da1333c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SaltStack Master v2019.2.3 +# SaltStack Master v3000 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:2019.2.3 +docker pull cdalvaro/saltstack-master:3000 ``` 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:2019.2.3 + cdalvaro/saltstack-master:3000 ``` ## 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:2019.2.3 + cdalvaro/saltstack-master:3000 ``` ### 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:2019.2.3 + cdalvaro/saltstack-master:3000 ``` 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:2019.2.3 app:gen-signed-keys other_master_sign + cdalvaro/saltstack-master:3000 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:2019.2.3 + cdalvaro/saltstack-master:3000 ``` ### 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:2019.2.3 + cdalvaro/saltstack-master:3000 ``` 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:2019.2.3 + cdalvaro/saltstack-master:3000 ``` ## Usage diff --git a/VERSION b/VERSION index bcaaf29..8da85a2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2019.2.3 \ No newline at end of file +3000 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 5496963..e1f1f4e 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:2019.2.3 + image: cdalvaro/saltstack-master:3000 restart: always volumes: - "roots/:/home/salt/data/srv" From 4950a233f21a2e599864f0c16795703b023d6e90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Tue, 11 Feb 2020 19:07:03 +0100 Subject: [PATCH 5/5] feat: Change salt-master path --- assets/build/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/build/install.sh b/assets/build/install.sh index 9f495a0..121806d 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -88,7 +88,7 @@ cat > /etc/supervisor/conf.d/salt-master.conf <