Merge pull request #4 from voxpupuli/updates

Use more precise container image names and add rubocop-performance
voxpupuli · Apr 2, 2024 · ffdd8ef · ffdd8ef
2 parents 981ef41 + 4e920c4
commit ffdd8ef
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
@@ -43,6 +43,7 @@ jobs:
             RUBYGEM_VOXPUPULI_RELEASE=${{ matrix.rubygem_voxpupuli_release }}
             RUBYGEM_PUPPET_METADATA=${{ matrix.rubygem_puppet_metadata }}
             RUBYGEM_MODULESYNC=${{ matrix.rubygem_modulesync }}
+            RUBYGEM_RUBOCOP_PERFORMANCE=${{ matrix.rubygem_rubocop_performance }}
           build_arch: linux/amd64,linux/arm64
           docker_username: voxpupulibot
           docker_password: ${{ secrets.DOCKERHUB_BOT_PASSWORD }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ghcr.io/betadots/ruby:2.7.8
+ARG BASE_IMAGE=ghcr.io/betadots/ruby:2.7.8-focal
 
 FROM $BASE_IMAGE
 
@@ -38,6 +38,9 @@ ENV RUBYGEM_R10K=${RUBYGEM_R10K:-4.0.2}
 ARG RUBYGEM_RA10KE
 ENV RUBYGEM_RA10KE=${RUBYGEM_RA10KE:-3.0.0}
 
+ARG RUBYGEM_RUBOCOP_PERFORMANCE
+ENV RUBYGEM_RUBOCOP_PERFORMANCE=${RUBYGEM_RUBOCOP_PERFORMANCE:-1.21.0}
+
 COPY voxbox/Gemfile /
 COPY voxbox/Rakefile /
 COPY Dockerfile /

diff --git a/build_versions.json b/build_versions.json
@@ -2,7 +2,7 @@
   "include": [
     {
       "puppet_release": 7,
-      "base_image": "ghcr.io/betadots/ruby:2.7.8",
+      "base_image": "ghcr.io/betadots/ruby:2.7.8-focal",
       "rubygem_puppet": "7.29.1",
       "rubygem_facter": "4.6.1",
       "rubygem_voxpupuli_test": "7.1.0",
@@ -12,11 +12,12 @@
       "rubygem_overcommit": "0.63.0",
       "rubygem_modulesync": "3.2.0",
       "rubygem_r10k": "4.0.2",
-      "rubygem_ra10ke": "3.0.0"
+      "rubygem_ra10ke": "3.0.0",
+      "rubygem_rubocop_performance": "1.21.0"
     },
     {
       "puppet_release": 8,
-      "base_image": "ghcr.io/betadots/ruby:3.2.3",
+      "base_image": "ghcr.io/betadots/ruby:3.2.3-jammy",
       "rubygem_puppet": "8.5.1",
       "rubygem_facter": "4.6.1",
       "rubygem_voxpupuli_test": "7.1.0",
@@ -26,7 +27,8 @@
       "rubygem_overcommit": "0.63.0",
       "rubygem_modulesync": "3.2.0",
       "rubygem_r10k": "4.0.2",
-      "rubygem_ra10ke": "3.0.0"
+      "rubygem_ra10ke": "3.0.0",
+      "rubygem_rubocop_performance": "1.21.0"
     }
   ]
 }
diff --git a/voxbox/Gemfile b/voxbox/Gemfile
@@ -11,5 +11,6 @@ gem 'ra10ke',               ENV['RUBYGEM_RA10KE']
 gem 'voxpupuli-acceptance', ENV['RUBYGEM_VOXPUPULI_ACCEPTANCE']
 gem 'voxpupuli-release',    ENV['RUBYGEM_VOXPUPULI_RELEASE']
 gem 'voxpupuli-test',       ENV['RUBYGEM_VOXPUPULI_TEST']
+gem 'rubocop-performance',  ENV['RUBYGEM_RUBOCOP_PERFORMANCE']
 
 # vim: syntax=ruby