Merge branch 'main' into update_ci_example

Author: rwaffen

Dockerfile

@@ -4,7 +4,7 @@ FROM $BASE_IMAGE AS builder
 
 # Gems have to be ARG and ENV because they are used as reference in the Gemfile
 ARG RUBYGEM_PUPPET
-ENV RUBYGEM_PUPPET ${RUBYGEM_PUPPET:-8.8.1}
+ENV RUBYGEM_PUPPET=${RUBYGEM_PUPPET:-8.8.1}
 
 ARG RUBYGEM_FACTER
 ENV RUBYGEM_FACTER=${RUBYGEM_FACTER:-4.8.0}
@@ -76,7 +76,7 @@ LABEL org.label-schema.maintainer="Voxpupuli Team <voxpupuli@groups.io>" \
 ARG APK_JQ=1.7.1-r0
 ARG APK_YAMLLINT=1.35.1-r1
 ARG APK_GIT=2.45.2-r0
-ARG APK_CURL=8.10.1-r0
+ARG APK_CURL=8.11.0-r2
 
 RUN apk update \
     && apk upgrade \

RELEASE.md

@@ -10,16 +10,17 @@ Your attention to this specific branch naming convention is essential for accura
 ```shell
 export RELEASE_VERSION="X.Y.Z"
 git switch main
-git pull -r
+git pull --rebase
 git switch -c release-v$RELEASE_VERSION
 
 bundle config set --local path vendor/bundle
 bundle config set --local with 'release'
 bundle install
 
 CHANGELOG_GITHUB_TOKEN="token_MC_tokenface" bundle exec rake changelog
-git commit -am "Release v${RELEASE_VERSION}"
-git push origin release-v$RELEASE_VERSION
+
+git commit --all --message "Release v${RELEASE_VERSION}"
+git push --set-upstream origin HEAD
 ```
 
 Then open a PR, discuss and merge.
@@ -28,7 +29,7 @@ Then open a PR, discuss and merge.
 
 ```shell
 git switch main
-git pull -r
+git pull --rebase
 git tag v$RELEASE_VERSION -m "v$RELEASE_VERSION"
 git push --tags
 ```

build_versions.json

@@ -38,7 +38,7 @@
       "apk_jq": "1.7.1-r0",
       "apk_yamllint": "1.35.1-r1",
       "apk_git": "2.45.2-r0",
-      "apk_curl": "8.10.1-r0"
+      "apk_curl": "8.11.0-r2"
     }
   ]
 }