Skip to content

Commit 4927de7

Browse files
authored
Merge pull request #114 from voxpupuli/fix-use-r10k-ra10ke
fix: actually use specified r10k and ra10ke versions
2 parents facefa6 + a28e57c commit 4927de7

File tree

6 files changed

+27
-20
lines changed

6 files changed

+27
-20
lines changed

.github/workflows/build_container.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@ jobs:
4747
RUBYGEM_FACTER=${{ matrix.rubygem_facter }}
4848
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
4949
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
50+
RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }}
5051
RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
5152
RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
53+
RUBYGEM_R10K=${{ matrix.rubygem_r10k }}
54+
RUBYGEM_RA10KE=${{ matrix.rubygem_ra10ke }}
5255
RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }}
5356
RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }}
5457
RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }}
5558
RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli-release }}
5659
RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli-test }}
57-
RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }}
5860
build_arch: linux/${{ matrix.platform }}
5961
docker_username: voxpupulibot
6062
docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}

.github/workflows/ci.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,16 @@ jobs:
4949
RUBYGEM_FACTER=${{ matrix.rubygem_facter }}
5050
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
5151
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
52+
RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }}
5253
RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
5354
RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
55+
RUBYGEM_R10K=${{ matrix.rubygem_r10k }}
56+
RUBYGEM_RA10KE=${{ matrix.rubygem_ra10ke }}
5457
RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }}
5558
RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }}
5659
RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }}
5760
RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli-release }}
5861
RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli-test }}
59-
RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }}
6062
6163
- name: Clone voxpupuli/puppet-example repository
6264
uses: actions/checkout@v4

.github/workflows/security_scanning.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,16 @@ jobs:
5050
RUBYGEM_FACTER=${{ matrix.rubygem_facter }}
5151
RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
5252
RUBYGEM_ONCEOVER=${{ matrix.rubygem_onceover }}
53+
RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }}
5354
RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
5455
RUBYGEM_PUPPET=${{ matrix.rubygem_puppet }}
56+
RUBYGEM_R10K=${{ matrix.rubygem_r10k }}
57+
RUBYGEM_RA10KE=${{ matrix.rubygem_ra10ke }}
5558
RUBYGEM_RSPEC_JUNIT_FORMATTER=${{ matrix.rubygem_rspec_junit_formatter }}
5659
RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop-performance }}
5760
RUBYGEM_VOXPUPULI_ACCEPTANCE=${{ matrix.rubygem_voxpupuli-acceptance }}
5861
RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli-release }}
5962
RUBYGEM_VOXPUPULI_TEST=${{ matrix.rubygem_voxpupuli-test }}
60-
RUBYGEM_PUPPET_GHOSTBUSTER=${{ matrix.rubygem_puppet-ghostbuster }}
6163
6264
- name: Scan image with Anchore Grype
6365
uses: anchore/scan-action@v6

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,31 @@ ARG RUBYGEM_FACTER
1010
ENV RUBYGEM_FACTER=${RUBYGEM_FACTER:-4.10.0}
1111

1212
ARG RUBYGEM_VOXPUPULI_TEST
13-
ENV RUBYGEM_VOXPUPULI_TEST=${RUBYGEM_VOXPUPULI_TEST:-9.2.0}
13+
ENV RUBYGEM_VOXPUPULI_TEST=${RUBYGEM_VOXPUPULI_TEST:-9.2.1}
1414

1515
ARG RUBYGEM_VOXPUPULI_ACCEPTANCE
16-
ENV RUBYGEM_VOXPUPULI_ACCEPTANCE=${RUBYGEM_VOXPUPULI_ACCEPTANCE:-3.2.0}
16+
ENV RUBYGEM_VOXPUPULI_ACCEPTANCE=${RUBYGEM_VOXPUPULI_ACCEPTANCE:-3.5.1}
1717

1818
ARG RUBYGEM_VOXPUPULI_RELEASE
19-
ENV RUBYGEM_VOXPUPULI_RELEASE=${RUBYGEM_VOXPUPULI_RELEASE:-3.1.0}
19+
ENV RUBYGEM_VOXPUPULI_RELEASE=${RUBYGEM_VOXPUPULI_RELEASE:-3.2.3}
2020

2121
ARG RUBYGEM_PUPPET_METADATA
22-
ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-4.5.0}
22+
ENV RUBYGEM_PUPPET_METADATA=${RUBYGEM_PUPPET_METADATA:-5.0.0}
2323

2424
ARG RUBYGEM_MODULESYNC
25-
ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.2.0}
25+
ENV RUBYGEM_MODULESYNC=${RUBYGEM_MODULESYNC:-3.4.1}
2626

2727
ARG RUBYGEM_R10K
28-
ENV RUBYGEM_R10K=${RUBYGEM_R10K:-4.1.0}
28+
ENV RUBYGEM_R10K=${RUBYGEM_R10K:-5.0.0}
2929

3030
ARG RUBYGEM_RA10KE
31-
ENV RUBYGEM_RA10KE=${RUBYGEM_RA10KE:-3.1.0}
31+
ENV RUBYGEM_RA10KE=${RUBYGEM_RA10KE:-4.3.0}
3232

3333
ARG RUBYGEM_RUBOCOP_PERFORMANCE
3434
ENV RUBYGEM_RUBOCOP_PERFORMANCE=${RUBYGEM_RUBOCOP_PERFORMANCE:-1.23.0}
3535

3636
ARG RUBYGEM_BUNDLER
37-
ENV RUBYGEM_BUNDLER=${RUBYGEM_BUNDLER:-2.5.23}
37+
ENV RUBYGEM_BUNDLER=${RUBYGEM_BUNDLER:-2.6.9}
3838

3939
ARG RUBYGEM_ONCEOVER
4040
ENV RUBYGEM_ONCEOVER=${RUBYGEM_ONCEOVER:-4.0.0}

build_versions.yaml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@
22
include:
33
- puppet_release: 8
44
base_image: 'docker.io/ruby:3.2.5-alpine3.20'
5-
rubygem_bundler: '2.6.5'
5+
rubygem_bundler: '2.6.9'
66
rubygem_facter: '4.10.0'
7-
rubygem_modulesync: '3.2.0'
7+
rubygem_modulesync: '3.4.1'
88
rubygem_onceover: '4.0.0'
9-
rubygem_puppet_metadata: '4.6.0'
9+
rubygem_puppet_metadata: '5.0.0'
10+
rubygem_puppet-ghostbuster: '1.2.1'
1011
rubygem_puppet: '8.10.0'
1112
rubygem_r10k: '5.0.0'
1213
rubygem_ra10ke: '4.3.0'
1314
rubygem_rspec_junit_formatter: '0.6.0'
14-
rubygem_rubocop-performance: '1.22.1'
15-
rubygem_voxpupuli-acceptance: '3.2.0'
16-
rubygem_voxpupuli-release: '3.1.0'
17-
rubygem_voxpupuli-test: '9.2.0'
18-
rubygem_puppet-ghostbuster: '1.2.1'
15+
# need to be compatible with rubocop 1.50 because voxpupuli-test demands it
16+
rubygem_rubocop-performance: '1.23.0'
17+
rubygem_voxpupuli-acceptance: '3.5.1'
18+
rubygem_voxpupuli-release: '3.2.3'
19+
rubygem_voxpupuli-test: '9.2.1'

voxbox/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ gem 'rdoc', '~> 6.7' # rdoc 6.2.1 has CVEs - remove default and ins
2424

2525
# Pin dependencies to avoid installing duplicate versions
2626
# see https://github.com/voxpupuli/container-voxbox/issues/97
27-
gem 'racc', '1.6.2'
27+
gem 'racc', '1.8.1'
2828
gem 'minitest', '5.16.3'
2929
gem 'drb', '2.1.1'
3030
gem 'csv', '3.2.6'

0 commit comments

Comments
 (0)