Merge pull request #176 from cdalvaro/upgrade/v3005.1-2

Upgrade to v3005.1-2 Phosphorus

.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,7 +26,7 @@ The full log with the outputted error.
 **Version report (please complete the following information):**
  - Host OS: [e.g. `uname -a`]
  - Docker: [e.g. `docker --version`]
- - Image tag: [e.g. `3005.1_2`]
+ - Image tag: [e.g. `3005.1-2`]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/build-and-test.yml

@@ -133,11 +133,13 @@ jobs:
       - name: Install and configure salt-minion
         run: |
           # Install salt-minion from salt repos
+          VERSION=$(cat VERSION)
           curl -o bootstrap-salt.sh -L https://bootstrap.saltproject.io
           chmod +x bootstrap-salt.sh
-          sudo ./bootstrap-salt.sh -dXP stable $(cat VERSION)
+          sudo ./bootstrap-salt.sh -dXP stable "${VERSION%%-*}"
           sudo systemctl stop salt-minion
           sudo systemctl disable salt-minion
+          sudo rm -f /var/log/salt/minion
 
       - name: Execute basic tests
         if: always()

.github/workflows/publish.yml

@@ -18,7 +18,7 @@ on:
 env:
   IMAGE_NAME: cdalvaro/docker-salt-master
   PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
-  CACHE_PATH: /tmp/.buildx-docker-salt-master-cache
+  CACHE_PATH: ${{ github.workspace }}/.buildx-cache
   EXTRA_REGISTRIES: ghcr.io quay.io
 
 jobs:
@@ -46,6 +46,7 @@ jobs:
           echo "Docker image: '${DOCKER_IMAGE}'"
           echo "Tags: ${TAGS}"
 
+          # FIXME: set-output is deprecated
           echo ::set-output name=tags::${TAGS}
 
       - name: VCS ref
@@ -53,6 +54,7 @@ jobs:
         run: |
           VCS_REF="${GITHUB_SHA::8}"
           echo "VCS ref: ${VCS_REF}"
+          # FIXME: set-output is deprecated
           echo ::set-output name=vcs_ref::${VCS_REF}
 
       - name: Created On
@@ -60,6 +62,7 @@ jobs:
         run: |
           CREATED_ON="$(date -u +"%Y-%m-%dT%H:%M:%SZ")"
           echo "Created on: ${CREATED_ON}"
+          # FIXME: set-output is deprecated
           echo ::set-output name=created_on::${CREATED_ON}
 
       - name: Dump environment
@@ -87,6 +90,7 @@ jobs:
         uses: docker/setup-buildx-action@v2.2.1
 
       - name: Cache Docker layers
+        id: cache-docker-layers
         uses: actions/cache@v3
         with:
           path: ${{ env.CACHE_PATH }}
@@ -94,6 +98,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx-
 
+      - name: Cache hit
+        continue-on-error: true
+        env:
+          CACHE_HIT: ${{ steps.cache-docker-layers.outputs.cache-hit }}
+        run: |
+          if [[ "${CACHE_HIT}" != 'true' ]]; then
+            echo "No cache hit" >&2
+            exit 1
+          fi
+          echo "Cache contents available at: ${CACHE_PATH}"
+
       - name: Login to Docker Container Registry
         uses: docker/login-action@v2.1.0
         with:
@@ -127,5 +142,6 @@ jobs:
             type=local,src=${{ env.CACHE_PATH }}
             ghcr.io/cdalvaro/docker-salt-master:latest
           cache-to: type=local,dest=${{ env.CACHE_PATH }}
+          pull: true
           push: true
           tags: ${{ needs.metadata.outputs.tags }}

CHANGELOG.md

@@ -4,6 +4,10 @@ This file only reflects the changes that are made in this image.
 Please refer to the [Salt 3005.1 Release Notes](https://docs.saltstack.com/en/latest/topics/releases/3005.1.html)
 for the list of changes in SaltStack.
 
+**3005.1-2**
+
+- Upgrade `salt-master` to `3005.1-2` *Phosphorus*.
+
 **3005.1_2**
 
 - Add support for GPG keys.

Dockerfile

@@ -4,8 +4,8 @@ ARG BUILD_DATE
 ARG VCS_REF
 
 # https://github.com/saltstack/salt/releases
-ENV SALT_VERSION="3005.1"
+ENV SALT_VERSION="3005.1-2"
-ENV IMAGE_VERSION="${SALT_VERSION}_2"
+ENV IMAGE_VERSION="${SALT_VERSION}"
 
 ENV SALT_DOCKER_DIR="/etc/docker-salt" \
     SALT_ROOT_DIR="/etc/salt" \

Makefile

@@ -18,7 +18,7 @@ build:
 
 release: build
 	@docker tag cdalvaro/docker-salt-master:latest \
-		cdalvaro/docker-salt-master:$(shell cat VERSION)_2
+		cdalvaro/docker-salt-master:$(shell cat VERSION)
 
 quickstart:
 	@echo "Starting docker-salt-master container..."

README.md

@@ -7,7 +7,7 @@
 [![Architecture ARM64][arch_arm64_badge]][arch_link]
 [![Architecture ARM/v7][arch_arm_badge]][arch_link]
 
-# Dockerized Salt Master v3005.1 _Phosphorus_
+# Dockerized Salt Master v3005.1-2 _Phosphorus_
 
 Dockerfile to build a [Salt Project](https://saltproject.io) Master image for the Docker opensource container platform.
 
@@ -24,7 +24,7 @@ Automated builds of the image are available on
 the recommended method of installation.
 
 ```sh
-docker pull ghcr.io/cdalvaro/docker-salt-master:3005.1_2
+docker pull ghcr.io/cdalvaro/docker-salt-master:3005.1-2
 ```
 
 You can also pull the latest tag which is built from the repository `HEAD`
@@ -768,7 +768,7 @@ Many thanks to:
 - https://docs.saltproject.io/en/getstarted/
 - https://docs.saltproject.io/en/latest/contents.html
 
-[saltproject_badge]: https://img.shields.io/badge/Salt-v3005.1-lightgrey.svg?logo=Saltstack
+[saltproject_badge]: https://img.shields.io/badge/Salt-v3005.1--2-lightgrey.svg?logo=Saltstack
 
 [saltproject_release_notes]: https://docs.saltproject.io/en/latest/topics/releases/3005.1.html "Salt Project Release Notes"
 

VERSION

@@ -1 +1 @@
-3005.1
+3005.1-2

tests/basic/test.sh

@@ -19,8 +19,9 @@ ok "container started"
 # Check salt version
 echo "==> Checking salt-master version ..."
 docker-exec salt-master --versions
-[[ "$(docker-exec salt-master --version)" == "salt-master $(cat VERSION)" ]] || error "salt-master version"
+EXPECTED_VERSION="$(cat VERSION)"
-ok "salt-master version"
+CURRENT_VERSION="$(docker-exec salt-master --version)"
+check_equal "${CURRENT_VERSION}" "salt-master ${EXPECTED_VERSION%%-*}" "salt-master --version"
 
 # Test image calling healthcheck
 echo "==> Executing healthcheck ..."