From bb3c4b4f33561e9a5bc8f410a336178c3fceab28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 17 Oct 2020 20:18:21 +0200 Subject: [PATCH 1/7] feat: Change Docker base image to ubuntu:focal-20200925 --- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- README.md | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 99ea077..2a947ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ 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/3001.1.html) for the list of changes in SaltStack. +**3002** + +- Change Docker base image to `ubuntu:focal-20200925` + **3001.1** - Upgrade SaltStack Master to `3001.1` *Sodium* diff --git a/Dockerfile b/Dockerfile index e7eea19..f9e453b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:focal-20200720 +FROM ubuntu:focal-20200925 ARG BUILD_DATE ARG VCS_REF diff --git a/README.md b/README.md index 22626f2..40c8ac9 100644 --- a/README.md +++ b/README.md @@ -529,7 +529,7 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC [saltstack_badge]: https://img.shields.io/badge/SaltStack-v3001.1-lightgrey.svg?style=flat-square&logo=Saltstack [saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3001.1.html "SaltStack Release Notes" -[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20200720-E95420.svg?style=flat-square&logo=Ubuntu +[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal---20200925-E95420.svg?style=flat-square&logo=Ubuntu [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" [github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?style=flat-square&label=build&logo=GitHub&logoColor=%23181717 [github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22 From 3db9bdfc22021038b6575e0386bee17b505a89a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 17 Oct 2020 20:54:17 +0200 Subject: [PATCH 2/7] feat: Install pygit2 and m2crypto from ubuntu repositories --- CHANGELOG.md | 1 + Dockerfile | 6 +----- assets/build/install.sh | 24 ++---------------------- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a947ee..82ba05f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **3002** +- Install `pygit2` and `m2crypto` from ubuntu repositories - Change Docker base image to `ubuntu:focal-20200925` **3001.1** diff --git a/Dockerfile b/Dockerfile index f9e453b..57cc85a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,7 @@ ARG VCS_REF # https://github.com/saltstack/salt/releases ENV SALT_VERSION="3001.1" \ - PYTHON_VERSION="3.8" \ - LIBSSH2_VERSION="1.9.0" \ - LIBGIT2_VERSION="1.0.1" \ - PYGIT2_VERSION="1.2.1" \ - M2CRYPTO_VERSION="0.36.0" + PYTHON_VERSION="3.8" ENV SALT_DOCKER_DIR="/etc/docker-salt" \ SALT_ROOT_DIR="/etc/salt" \ diff --git a/assets/build/install.sh b/assets/build/install.sh index 275d7de..d027e56 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -28,32 +28,12 @@ exec_as_salt cat >> "${SALT_HOME}/.profile" < Date: Sat, 17 Oct 2020 21:06:38 +0200 Subject: [PATCH 3/7] feat: Remove patch for muting sudo RLIMIT_CORE message --- CHANGELOG.md | 1 + assets/build/install.sh | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82ba05f..48dd17f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **3002** +- Remove patch for muting sudo `RLIMIT_CORE` message - Install `pygit2` and `m2crypto` from ubuntu repositories - Change Docker base image to `ubuntu:focal-20200925` diff --git a/assets/build/install.sh b/assets/build/install.sh index d027e56..4aaa13e 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -15,10 +15,6 @@ BUILD_DEPENDENCIES=( apt-get update DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends "${BUILD_DEPENDENCIES[@]}" -# Mute sudo RLIMIT_CORE message -> Fixed in sudo 1.8.31p1 -echo "Muted sudo RLIMIT_CORE message" -echo "Set disable_coredump false" >> /etc/sudo.conf - # Create salt user echo "Creating ${SALT_USER} user ..." useradd -d "${SALT_HOME}" -ms /bin/bash -U -G root,sudo,shadow "${SALT_USER}" From 234e84ecee10e74cc2b256c9a41183c9dafaf405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sat, 17 Oct 2020 22:22:00 +0200 Subject: [PATCH 4/7] doc: Update README.md --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 40c8ac9..08e4a84 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,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/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` ## Configuration @@ -119,7 +119,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/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` ### Master Signed Keys @@ -134,7 +134,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/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` The container will create the `master_sign` key and its signature. @@ -146,7 +146,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/docker-salt-master:3001.1 \ + cdalvaro/docker-salt-master:latest \ app:gen-signed-keys new_master_sign ``` @@ -177,7 +177,7 @@ docker run --name salt_stack --detach \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ --volume $(pwd)/config/:/home/salt/data/config/ \ - cdalvaro/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` If you choose using the [docker-compose.yml](docker-compose.yml) to manage your salt-master instance, @@ -251,7 +251,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/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` ### Git Fileserver @@ -339,7 +339,7 @@ docker run --name salt_stack -it --rm \ --volume $(pwd)/roots/:/home/salt/data/srv/ \ --volume $(pwd)/3pfs/:/home/salt/data/3pfs/ \ --volume $(pwd)/keys/:/home/salt/data/keys/ \ - cdalvaro/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` If you need to add more third party formulas, you can restart the container, or you can type the following command: @@ -363,7 +363,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/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` Check [Available Configuration Parameters](#available-configuration-parameters) section for configuring logrotate. @@ -382,7 +382,7 @@ version: "3" services: master: container_name: salt_master - image: cdalvaro/docker-salt-master:3001.1 + image: cdalvaro/docker-salt-master:latest healthcheck: test: ["CMD", "/usr/local/sbin/healthcheck"] start_period: 30s @@ -401,7 +401,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/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` Then you can manually check this info by running the following command: @@ -486,7 +486,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/docker-salt-master:3001.1 + cdalvaro/docker-salt-master:latest ``` ## Usage From 0702715f5262e9c716d63696c0aa55b0ad01f3d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sun, 18 Oct 2020 10:34:26 +0200 Subject: [PATCH 5/7] feat: Differentiate salt-master version from image version --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 57cc85a..be7d122 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,6 +7,8 @@ ARG VCS_REF ENV SALT_VERSION="3001.1" \ PYTHON_VERSION="3.8" +ENV IMAGE_VERSION="${SALT_VERSION}" + ENV SALT_DOCKER_DIR="/etc/docker-salt" \ SALT_ROOT_DIR="/etc/salt" \ SALT_CACHE_DIR='/var/cache/salt' \ @@ -65,7 +67,7 @@ LABEL \ maintainer="carlos@cdalvaro.io" \ org.label-schema.vendor=cdalvaro \ org.label-schema.name="SaltStack Master" \ - org.label-schema.version=${SALT_VERSION} \ + org.label-schema.version=${IMAGE_VERSION} \ org.label-schema.description="Dockerized SaltStack Master" \ org.label-schema.url="https://github.com/cdalvaro/docker-salt-master" \ org.label-schema.vcs-url="https://github.com/cdalvaro/docker-salt-master.git" \ From f319d00adf550f942dee47d61618db40900510a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sun, 18 Oct 2020 10:40:33 +0200 Subject: [PATCH 6/7] ci: Bring back support for Linux ARMv7 platform --- .github/workflows/build-and-test.yml | 4 ++-- .github/workflows/publish.yml | 2 +- CHANGELOG.md | 1 + assets/build/install.sh | 35 +++++++++++++++++----------- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 75daa87..a5a87fe 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -46,7 +46,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7 cache-from: | type=local,src=${{ env.CACHE_PATH }} ghcr.io/cdalvaro/docker-salt-master:latest @@ -69,7 +69,7 @@ jobs: needs: build strategy: matrix: - platform: [linux/amd64, linux/arm64] + platform: [linux/amd64, linux/arm64, linux/arm/v7] env: DOCKER_CLI_EXPERIMENTAL: enabled SALTAPI_URL: https://localhost:8000/ diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6e67e99..9a66d47 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ on: env: GITHUB_REF_NAME: ${{ github.event.release.tag_name }} IMAGE_NAME: cdalvaro/docker-salt-master - PLATFORMS: linux/amd64,linux/arm64 + PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7 CACHE_PATH: /tmp/.buildx-docker-salt-master-cache EXTRA_REGISTRIES: ghcr.io quay.io diff --git a/CHANGELOG.md b/CHANGELOG.md index 48dd17f..869134f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **3002** +- Bring back support for Linux ARMv7 platform - Remove patch for muting sudo `RLIMIT_CORE` message - Install `pygit2` and `m2crypto` from ubuntu repositories - Change Docker base image to `ubuntu:focal-20200925` diff --git a/assets/build/install.sh b/assets/build/install.sh index 4aaa13e..83882c2 100755 --- a/assets/build/install.sh +++ b/assets/build/install.sh @@ -4,16 +4,16 @@ set -e source "${SALT_BUILD_DIR}/functions.sh" -# Install build dependencies -echo "Installing dependencies ..." -BUILD_DEPENDENCIES=( - cmake gcc g++ make \ - libhttp-parser-dev libssl-dev zlib1g-dev \ - libcurl4-openssl-dev libffi-dev swig \ -) - +echo "Updating repositories ..." apt-get update -DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends "${BUILD_DEPENDENCIES[@]}" + +# Install arm build dependencies +if [[ "$(uname -i)" =~ ^(arm|aarch64) ]]; then + echo "Installing arm dependencies ..." + DEBIAN_FRONTEND=noninteractive apt-get install --yes --quiet --no-install-recommends \ + make gcc g++ cmake libzmq3-dev \ + libhttp-parser-dev libssl-dev libcurl4-openssl-dev +fi # Create salt user echo "Creating ${SALT_USER} user ..." @@ -27,9 +27,9 @@ EOF # 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 python3-openssl \ -python3-pygit2 python3-m2crypto + python3-mako python3-pycryptodome python3-cherrypy3 python3-git python3-u-msgpack \ + python3-redis python3-gnupg python3-mysqldb python3-dateutil python3-libnacl python3-openssl \ + python3-pygit2 python3-m2crypto # Bootstrap script options: # https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html#command-line-options @@ -41,10 +41,17 @@ python3-pygit2 python3-m2crypto ## -p: Extra-package to install ## -x: Changes the python version used to install a git version of salt SALT_BOOTSTRAP_OPTS=( -M -N -X -d -P -p salt-api -p salt-call -x "python${PYTHON_VERSION}" ) +_WGET_ARGS=() + +if [[ "$(uname -i)" == 'armv7l' ]]; then + ## -I: allow insecure connections while downloading any files + SALT_BOOTSTRAP_OPTS+=( -I ) + _WGET_ARGS+=( --no-check-certificate ) +fi echo "Installing saltstack ..." echo "Option: ${SALT_BOOTSTRAP_OPTS[@]}" -wget -O bootstrap-salt.sh https://bootstrap.saltstack.com +wget ${_WGET_ARGS[@]} -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}" @@ -97,6 +104,6 @@ stdout_logfile=${SALT_LOGS_DIR}/supervisor/%(program_name)s.log stderr_logfile=${SALT_LOGS_DIR}/supervisor/%(program_name)s.log EOF -# purge build dependencies and cleanup apt +# Purge build dependencies and cleanup apt DEBIAN_FRONTEND=noninteractive apt-get clean --yes rm -rf /var/lib/apt/lists/* From e709252a21668fce7ff2e2d51ac9f28aa7c6c04a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20=C3=81lvaro?= Date: Sun, 18 Oct 2020 18:57:51 +0200 Subject: [PATCH 7/7] feat: Upgrade salt-master to 3002 Magnesium --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- CHANGELOG.md | 29 ++++++++++++++-------------- Dockerfile | 2 +- README.md | 15 ++++++++------ VERSION | 2 +- docker-compose.yml | 2 +- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index cb55991..56ec8cc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -26,7 +26,7 @@ The full log with the outputted error. **Version report (please complete the following information):** - OS: [e.g. `uname -a`] - Docker: [`docker --version`] - - Image tag: [e.g. 3001.1] + - Image tag: [e.g. 3002] **Additional context** Add any other context about the problem here. diff --git a/CHANGELOG.md b/CHANGELOG.md index 869134f..5a55689 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,11 @@ # 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/3001.1.html) for the list of changes in SaltStack. +Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3002.html) for the list of changes in SaltStack. **3002** +- Upgrade `salt-master` to `3002` *Magnesium* - Bring back support for Linux ARMv7 platform - Remove patch for muting sudo `RLIMIT_CORE` message - Install `pygit2` and `m2crypto` from ubuntu repositories @@ -12,13 +13,13 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **3001.1** -- Upgrade SaltStack Master to `3001.1` *Sodium* +- Upgrade `salt-master` to `3001.1` *Sodium* - Upgrade `m2crypto` to version `0.36.0` - Change Docker base image to `ubuntu:focal-20200720` **3001** -- Upgrade SaltStack Master to `3001` *Sodium* +- Upgrade `salt-master` to `3001` *Sodium* - Upgrade Python to version `3.8` - Upgrade `libgit2` to version `1.0.1` - Change Docker base image to `ubuntu:focal-20200606` @@ -38,18 +39,18 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **3000.3** -- Upgrade SaltStack Master to `3000.3` +- Upgrade `salt-master` to `3000.3` - Upgrade `pygit2` to version `1.2.1` **3000.2** -- Upgrade SaltStack Master to `3000.2` +- Upgrade `salt-master` to `3000.2` - Upgrade `pygit2` to version `1.2.0` - Change Docker base image to `ubuntu:bionic-20200403` **3000.1** -- Upgrade SaltStack Master to `3000.1` +- Upgrade `salt-master` to `3000.1` - Upgrade `libgit2` to version `1.0.0` - Upgrade `pygit2` to version `1.1.1` @@ -60,32 +61,32 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **3000** -- Upgrade SaltStack Master to `3000` *Neon* +- Upgrade `salt-master` to `3000` *Neon* - Change Docker base image to `ubuntu:bionic-20200112` - Upgrade pygit2 to version `1.0.3` **2019.2.3** -- Upgrade SaltStack Master to `2019.2.3` +- Upgrade `salt-master` to `2019.2.3` - Change Docker base image to `ubuntu:bionic-20191202` - Upgrade `libgit2` to version `0.28.4` - Upgrade `pygit2` to version `1.0.2` **2019.2.2** -- Upgrade SaltStack Master to `2019.2.2` +- Upgrade `salt-master` to `2019.2.2` - Change Docker base image to `ubuntu:bionic-20191010` **2019.2.1** -- Upgrade SaltStack Master to `2019.2.1` +- Upgrade `salt-master` to `2019.2.1` - Change Docker base image to `ubuntu:bionic-20190912.1` - Upgrade `libssh2` to version `1.9.0` - Upgrade `m2crypto` to version `0.35.2` **2019.2.0** -- Upgrade SaltStack Master to `2019.2.0` +- Upgrade `salt-master` to `2019.2.0` - Change Docker base image to `ubuntu:bionic-20190204` - Upgrade Python to version `3.6` - Upgrade `libgit2` to `0.27.8` @@ -93,12 +94,12 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **2018.3.4** -- Upgrade SaltStack Master to `2018.3.4` +- Upgrade `salt-master` to `2018.3.4` - Change Docker base image to `ubuntu:xenial-20190122` **2018.3.3** -- Upgrade SaltStack Master to `2018.3.3` +- Upgrade `salt-master` to `2018.3.3` - Change Docker base image to `ubuntu:xenial-20181113` - Add `GitPython` support - Add `PyGit2` support @@ -113,4 +114,4 @@ Please refer to the SaltStack [Release Notes](https://docs.saltstack.com/en/late **2018.3.2** -- First version: SaltStack Master `2018.3.2` +- First version: `salt-master` `2018.3.2` diff --git a/Dockerfile b/Dockerfile index be7d122..a534b27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG BUILD_DATE ARG VCS_REF # https://github.com/saltstack/salt/releases -ENV SALT_VERSION="3001.1" \ +ENV SALT_VERSION="3002" \ PYTHON_VERSION="3.8" ENV IMAGE_VERSION="${SALT_VERSION}" diff --git a/README.md b/README.md index 08e4a84..23d37f4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,12 @@ [![SaltStack][saltstack_badge]][saltstack_release_notes] [![Ubuntu Image][ubuntu_badge]][ubuntu_hub_docker] +[![StackOverflow Community][stackoverflow_badge]][stackoverflow_community] +[![Slack Community][slack_badge]][slack_community] [![Publish Workflow][github_publish_badge]][github_publish_workflow] [![Docker Image Size][docker_size_badge]][docker_hub_tags] [![CodeFactor][codefactor_badge]][codefactor_score] -[![StackOverflow Community][stackoverflow_badge]][stackoverflow_community] -# Dockerized SaltStack Master Sodium v3001.1 +# Dockerized SaltStack Master Magnesium v3002 Dockerfile to build a [SaltStack](https://www.saltstack.com) Master image for the Docker opensource container platform. @@ -43,7 +44,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/docker-salt-master/) and is the recommended method of installation. ```sh -docker pull cdalvaro/docker-salt-master:3001.1 +docker pull cdalvaro/docker-salt-master:3002 ``` You can also pull the latest tag which is built from the repository `HEAD` @@ -527,9 +528,9 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC - https://docs.saltstack.com/en/latest/topics/tutorials/salt_bootstrap.html - https://github.com/saltstack/salt/releases -[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3001.1-lightgrey.svg?style=flat-square&logo=Saltstack -[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3001.1.html "SaltStack Release Notes" -[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal---20200925-E95420.svg?style=flat-square&logo=Ubuntu +[saltstack_badge]: https://img.shields.io/badge/SaltStack-v3002-lightgrey.svg?style=flat-square&logo=Saltstack +[saltstack_release_notes]: https://docs.saltstack.com/en/latest/topics/releases/3002.html "SaltStack Release Notes" +[ubuntu_badge]: https://img.shields.io/badge/ubuntu-focal--20200925-E95420.svg?style=flat-square&logo=Ubuntu [ubuntu_hub_docker]: https://hub.docker.com/_/ubuntu/ "Ubuntu Image" [github_publish_badge]: https://img.shields.io/github/workflow/status/cdalvaro/docker-salt-master/Publish%20Docker%20image?style=flat-square&label=build&logo=GitHub&logoColor=%23181717 [github_publish_workflow]: https://github.com/cdalvaro/docker-salt-master/actions?query=workflow%3A%22Publish+Docker+image%22 @@ -539,3 +540,5 @@ Where `salt-service` is one of: `salt-master` os `salt-api` (if `SALT_API_SERVIC [codefactor_score]: https://www.codefactor.io/repository/github/cdalvaro/docker-salt-master [stackoverflow_badge]: https://img.shields.io/badge/stackoverflow-community-orange?style=flat-square&logo=stackoverflow&color=FE7A16 [stackoverflow_community]: https://stackoverflow.com/tags/salt-stack +[slack_badge]: https://img.shields.io/badge/slack-@saltstackcommunity-blue.svg?style=flat-square&logo=slack&logoColor=4A154B&color=4A154B +[slack_community]: https://saltstackcommunity.herokuapp.com \ No newline at end of file diff --git a/VERSION b/VERSION index d1e07a8..bcce32e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3001.1 \ No newline at end of file +3002 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index cdf1906..450078f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3' services: master: container_name: salt_master - image: cdalvaro/docker-salt-master:3001.1 + image: cdalvaro/docker-salt-master:3002 restart: always volumes: - "roots/:/home/salt/data/srv"