From 264486cc844e3bf40d312659c61c3760968b8252 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Mon, 19 May 2025 16:39:12 +0200 Subject: [PATCH 1/9] fix: actually use specified r10k and ra10ke versions --- .github/workflows/build_container.yml | 4 +++- .github/workflows/ci.yaml | 4 +++- .github/workflows/security_scanning.yml | 4 +++- build_versions.yaml | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index d4a7967..a4f78bd 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -47,14 +47,16 @@ jobs: RUBYGEM_FACTER=${{ matrix.rubygem_facter }} RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }} RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }} + RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }} RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }} + RUBYGEM_PUPPET_R10K=${{ matrix.rubygem_r10k }} + RUBYGEM_PUPPET_RA10KE=${{ matrix.rubygem_ra10ke }} RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }} RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }} RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }} RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli-release }} RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli-test }} - RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} build_arch: linux/${{ matrix.platform }} docker_username: voxpupulibot docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5d5d383..bf17461 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -49,14 +49,16 @@ jobs: RUBYGEM_FACTER=${{ matrix.rubygem_facter }} RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }} RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }} + RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }} RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }} + RUBYGEM_PUPPET_R10K=${{ matrix.rubygem_r10k }} + RUBYGEM_PUPPET_RA10KE=${{ matrix.rubygem_ra10ke }} RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }} RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }} RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }} RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli-release }} RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli-test }} - RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} - name: Clone voxpupuli/puppet-example repository uses: actions/checkout@v4 diff --git a/.github/workflows/security_scanning.yml b/.github/workflows/security_scanning.yml index f8de057..a66f765 100644 --- a/.github/workflows/security_scanning.yml +++ b/.github/workflows/security_scanning.yml @@ -50,14 +50,16 @@ jobs: RUBYGEM_FACTER=${{ matrix.rubygem_facter }} RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }} RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }} + RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }} RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }} + RUBYGEM_PUPPET_R10K=${{ matrix.rubygem_r10k }} + RUBYGEM_PUPPET_RA10KE=${{ matrix.rubygem_ra10ke }} RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }} RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }} RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }} RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli-release }} RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli-test }} - RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} - name: Scan image with Anchore Grype uses: anchore/scan-action@v6 diff --git a/build_versions.yaml b/build_versions.yaml index 4190b48..5504849 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -7,6 +7,7 @@ include: rubygem_modulesync: '3.2.0' rubygem_onceover: '4.0.0' rubygem_puppet_metadata: '4.6.0' + rubygem_puppet-ghostbuster: '1.2.1' rubygem_puppet: '8.10.0' rubygem_r10k: '5.0.0' rubygem_ra10ke: '4.3.0' @@ -15,4 +16,3 @@ include: rubygem_voxpupuli-acceptance: '3.2.0' rubygem_voxpupuli-release: '3.1.0' rubygem_voxpupuli-test: '9.2.0' - rubygem_puppet-ghostbuster: '1.2.1' From f9b832a20d15ae068612e2984ace3a2a0cd46e03 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Mon, 19 May 2025 16:46:53 +0200 Subject: [PATCH 2/9] fix: remove wrong gem prfix in name --- .github/workflows/build_container.yml | 4 ++-- .github/workflows/ci.yaml | 4 ++-- .github/workflows/security_scanning.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml index a4f78bd..62e1277 100644 --- a/.github/workflows/build_container.yml +++ b/.github/workflows/build_container.yml @@ -50,8 +50,8 @@ jobs: RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }} RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }} - RUBYGEM_PUPPET_R10K=${{ matrix.rubygem_r10k }} - RUBYGEM_PUPPET_RA10KE=${{ matrix.rubygem_ra10ke }} + RUBYGEM_R10K=${{ matrix.rubygem_r10k }} + RUBYGEM_RA10KE=${{ matrix.rubygem_ra10ke }} RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }} RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }} RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index bf17461..d682cf0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -52,8 +52,8 @@ jobs: RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }} RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }} - RUBYGEM_PUPPET_R10K=${{ matrix.rubygem_r10k }} - RUBYGEM_PUPPET_RA10KE=${{ matrix.rubygem_ra10ke }} + RUBYGEM_R10K=${{ matrix.rubygem_r10k }} + RUBYGEM_RA10KE=${{ matrix.rubygem_ra10ke }} RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }} RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }} RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }} diff --git a/.github/workflows/security_scanning.yml b/.github/workflows/security_scanning.yml index a66f765..c5400ca 100644 --- a/.github/workflows/security_scanning.yml +++ b/.github/workflows/security_scanning.yml @@ -53,8 +53,8 @@ jobs: RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }} RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }} RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }} - RUBYGEM_PUPPET_R10K=${{ matrix.rubygem_r10k }} - RUBYGEM_PUPPET_RA10KE=${{ matrix.rubygem_ra10ke }} + RUBYGEM_R10K=${{ matrix.rubygem_r10k }} + RUBYGEM_RA10KE=${{ matrix.rubygem_ra10ke }} RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }} RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }} RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }} From cf62291975d3dc50a978a2a958c7c1781848c196 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Mon, 19 May 2025 16:54:13 +0200 Subject: [PATCH 3/9] chore: update rubygems --- build_versions.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build_versions.yaml b/build_versions.yaml index 5504849..b8dc1c8 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -2,17 +2,17 @@ include: - puppet_release: 8 base_image: 'docker.io/ruby:3.2.5-alpine3.20' - rubygem_bundler: '2.6.5' + rubygem_bundler: '2.6.9' rubygem_facter: '4.10.0' rubygem_modulesync: '3.2.0' rubygem_onceover: '4.0.0' - rubygem_puppet_metadata: '4.6.0' + rubygem_puppet_metadata: '5.0.0' rubygem_puppet-ghostbuster: '1.2.1' rubygem_puppet: '8.10.0' rubygem_r10k: '5.0.0' rubygem_ra10ke: '4.3.0' rubygem_rspec_junit_formatter: '0.6.0' - rubygem_rubocop-performance: '1.22.1' - rubygem_voxpupuli-acceptance: '3.2.0' - rubygem_voxpupuli-release: '3.1.0' - rubygem_voxpupuli-test: '9.2.0' + rubygem_rubocop-performance: '1.25.0' + rubygem_voxpupuli-acceptance: '3.5.1' + rubygem_voxpupuli-release: '3.2.3' + rubygem_voxpupuli-test: '9.2.1' From e66136f2bcb21670d2a0f35a2efda32eb0cd7ec3 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Mon, 19 May 2025 16:59:07 +0200 Subject: [PATCH 4/9] chore: need to be compatible with rubocop 1.50 because voxpupuli-test demands it --- build_versions.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_versions.yaml b/build_versions.yaml index b8dc1c8..c2634a4 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -12,7 +12,8 @@ include: rubygem_r10k: '5.0.0' rubygem_ra10ke: '4.3.0' rubygem_rspec_junit_formatter: '0.6.0' - rubygem_rubocop-performance: '1.25.0' + # need to be compatible with rubocop 1.50 because voxpupuli-test demands it + rubygem_rubocop-performance: '1.22.1' rubygem_voxpupuli-acceptance: '3.5.1' rubygem_voxpupuli-release: '3.2.3' rubygem_voxpupuli-test: '9.2.1' From cb0a502b87a5db250e80d4b4653ca52853dfb0ce Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Mon, 19 May 2025 17:02:24 +0200 Subject: [PATCH 5/9] chore: update racc --- voxbox/Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/voxbox/Gemfile b/voxbox/Gemfile index 30c85a3..61384a6 100644 --- a/voxbox/Gemfile +++ b/voxbox/Gemfile @@ -24,7 +24,7 @@ gem 'rdoc', '~> 6.7' # rdoc 6.2.1 has CVEs - remove default and ins # Pin dependencies to avoid installing duplicate versions # see https://github.com/voxpupuli/container-voxbox/issues/97 -gem 'racc', '1.6.2' +gem 'racc', '1.8.1' gem 'minitest', '5.16.3' gem 'drb', '2.1.1' gem 'csv', '3.2.6' From 069d850b614431eafa2c404c16e4bc521a08ae24 Mon Sep 17 00:00:00 2001 From: Robert Waffen Date: Mon, 19 May 2025 17:20:40 +0200 Subject: [PATCH 6/9] chore: update variable defaults in dockerfile for local testing --- Dockerfile | 14 +++++++------- build_versions.yaml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index c0ae6f1..28e9abb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,31 +10,31 @@ ARG RUBYGEM_FACTER ENV RUBYGEM_FACTER=${RUBYGEM_FACTER:-4.10.0} ARG RUBYGEM_VOXPUPULI_TEST -ENV RUBYGEM_VOXPUPULI_TEST=${RUBYGEM_VOXPUPULI_TEST:-9.2.0} +ENV RUBYGEM_VOXPUPULI_TEST=${RUBYGEM_VOXPUPULI_TEST:-9.2.1} ARG RUBYGEM_VOXPUPULI_ACCEPTANCE -ENV RUBYGEM_VOXPUPULI_ACCEPTANCE=${RUBYGEM_VOXPUPULI_ACCEPTANCE:-3.2.0} +ENV RUBYGEM_VOXPUPULI_ACCEPTANCE=${RUBYGEM_VOXPUPULI_ACCEPTANCE:-3.5.1} ARG RUBYGEM_VOXPUPULI_RELEASE -ENV RUBYGEM_VOXPUPULI_RELEASE=${RUBYGEM_VOXPUPULI_RELEASE:-3.1.0} +ENV RUBYGEM_VOXPUPULI_RELEASE=${RUBYGEM_VOXPUPULI_RELEASE:-3.2.3} ARG RUBYGEM_PUPPET_METADATA -ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-4.5.0} +ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-5.0.0} ARG RUBYGEM_MODULESYNC ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.2.0} ARG RUBYGEM_R10K -ENV RUBYGEM_R10K=${RUBYGEM_R10K:-4.1.0} +ENV RUBYGEM_R10K=${RUBYGEM_R10K:-5.0.0} ARG RUBYGEM_RA10KE -ENV RUBYGEM_RA10KE=${RUBYGEM_RA10KE:-3.1.0} +ENV RUBYGEM_RA10KE=${RUBYGEM_RA10KE:-4.3.0} ARG RUBYGEM_RUBOCOP_PERFORMANCE ENV RUBYGEM_RUBOCOP_PERFORMANCE=${RUBYGEM_RUBOCOP_PERFORMANCE:-1.23.0} ARG RUBYGEM_BUNDLER -ENV RUBYGEM_BUNDLER=${RUBYGEM_BUNDLER:-2.5.23} +ENV RUBYGEM_BUNDLER=${RUBYGEM_BUNDLER:-2.6.9} ARG RUBYGEM_ONCEOVER ENV RUBYGEM_ONCEOVER=${RUBYGEM_ONCEOVER:-4.0.0} diff --git a/build_versions.yaml b/build_versions.yaml index c2634a4..ec3ed5f 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -13,7 +13,7 @@ include: rubygem_ra10ke: '4.3.0' rubygem_rspec_junit_formatter: '0.6.0' # need to be compatible with rubocop 1.50 because voxpupuli-test demands it - rubygem_rubocop-performance: '1.22.1' + rubygem_rubocop-performance: '1.23.0' rubygem_voxpupuli-acceptance: '3.5.1' rubygem_voxpupuli-release: '3.2.3' rubygem_voxpupuli-test: '9.2.1' From 8a0094d91d7db7b947de7ce07242ed88740aff82 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 21 May 2025 15:32:09 +0200 Subject: [PATCH 7/9] modulesync: Update 3.2.0->3.3.0 --- Dockerfile | 2 +- build_versions.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28e9abb..c41fdab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ ARG RUBYGEM_PUPPET_METADATA ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-5.0.0} ARG RUBYGEM_MODULESYNC -ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.2.0} +ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.3.0} ARG RUBYGEM_R10K ENV RUBYGEM_R10K=${RUBYGEM_R10K:-5.0.0} diff --git a/build_versions.yaml b/build_versions.yaml index ec3ed5f..f58401b 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -4,7 +4,7 @@ include: base_image: 'docker.io/ruby:3.2.5-alpine3.20' rubygem_bundler: '2.6.9' rubygem_facter: '4.10.0' - rubygem_modulesync: '3.2.0' + rubygem_modulesync: '3.3.0' rubygem_onceover: '4.0.0' rubygem_puppet_metadata: '5.0.0' rubygem_puppet-ghostbuster: '1.2.1' From 3d0627db0ac9e1493a3ff2c2e9dc811bb533a460 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 21 May 2025 15:36:11 +0200 Subject: [PATCH 8/9] modulesync: Update 3.3.0->3.4.0 --- Dockerfile | 2 +- build_versions.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c41fdab..d5e5c64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ ARG RUBYGEM_PUPPET_METADATA ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-5.0.0} ARG RUBYGEM_MODULESYNC -ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.3.0} +ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.4.0} ARG RUBYGEM_R10K ENV RUBYGEM_R10K=${RUBYGEM_R10K:-5.0.0} diff --git a/build_versions.yaml b/build_versions.yaml index f58401b..f7853ba 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -4,7 +4,7 @@ include: base_image: 'docker.io/ruby:3.2.5-alpine3.20' rubygem_bundler: '2.6.9' rubygem_facter: '4.10.0' - rubygem_modulesync: '3.3.0' + rubygem_modulesync: '3.4.0' rubygem_onceover: '4.0.0' rubygem_puppet_metadata: '5.0.0' rubygem_puppet-ghostbuster: '1.2.1' From a28e57c11968a5cb2b472a62e015ef0dca509613 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Wed, 21 May 2025 16:09:41 +0200 Subject: [PATCH 9/9] modulesync: Update 3.4.0->3.4.1 --- Dockerfile | 2 +- build_versions.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d5e5c64..175a128 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,7 +22,7 @@ ARG RUBYGEM_PUPPET_METADATA ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-5.0.0} ARG RUBYGEM_MODULESYNC -ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.4.0} +ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.4.1} ARG RUBYGEM_R10K ENV RUBYGEM_R10K=${RUBYGEM_R10K:-5.0.0} diff --git a/build_versions.yaml b/build_versions.yaml index f7853ba..2696132 100644 --- a/build_versions.yaml +++ b/build_versions.yaml @@ -4,7 +4,7 @@ include: base_image: 'docker.io/ruby:3.2.5-alpine3.20' rubygem_bundler: '2.6.9' rubygem_facter: '4.10.0' - rubygem_modulesync: '3.4.0' + rubygem_modulesync: '3.4.1' rubygem_onceover: '4.0.0' rubygem_puppet_metadata: '5.0.0' rubygem_puppet-ghostbuster: '1.2.1'