point container registry to rake-compiler/rake-compiler-dock-image

with new tag format

Author: flavorjones

History.md

@@ -9,6 +9,17 @@
 * Ensure autoconf is installed in the base iamges.
 * Start publishing snapshots to ghcr.io
 * Bump JRuby to 9.4.0.0
+* Move docker images to ghcr.io/rake-compiler:
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-jruby`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-aarch64-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-arm-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-arm64-darwin`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x64-mingw-ucrt`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x64-mingw32`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86-mingw32`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86_64-darwin`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-image:1.3.0-mri-x86_64-linux`
 
 
 1.2.2 / 2022-06-27

README.md

@@ -187,7 +187,7 @@ jobs:
     name: "native-gem"
     runs-on: ubuntu-latest
     container:
-      image: "larskanis/rake-compiler-dock-mri-x86_64-linux:1.2.1"
+      image: "ghcr.io/rake-compiler/rake-compiler-dock-image:1.2.2-mri-x86_64-linux"
     steps:
       - uses: actions/checkout@v2
       - run: bundle install && bundle exec rake gem:x86_64-linux:rcd
@@ -242,7 +242,7 @@ The following variables are recognized by rake-compiler-dock:
     Must be a space separated list out of `x86-mingw32`, `x64-mingw-ucrt`, `x64-mingw32`, `x86-linux`, `x86_64-linux`, `arm-linux`, `aarch64-linux`, `x86_64-darwin` and `arm64-darwin`.
     It is ignored when `rubyvm` is set to `:jruby`.
 * `RCD_IMAGE` - The docker image that is downloaded and started.
-    Defaults to "larskanis/rake-compiler-dock:IMAGE_VERSION" with an image version that is determined by the gem version.
+    Defaults to "ghcr.io/rake-compiler/rake-compiler-dock-image:IMAGE_VERSION-PLATFORM" with an image version that is determined by the gem version.
 
 The following variables are passed through to the docker container without modification:
 

lib/rake_compiler_dock/starter.rb

@@ -164,11 +164,11 @@ def container_image_name(options={})
           image_name = ENV['RCD_IMAGE'] || ENV['RAKE_COMPILER_DOCK_IMAGE']
           return image_name unless image_name.nil?
 
-          "%s/rake-compiler-dock-%s%s:%s" % [
+          "%s/rake-compiler-dock-image:%s-%s%s" % [
             container_registry,
+            IMAGE_VERSION,
             container_rubyvm(options),
             container_jrubyvm?(options) ? "" : "-#{options.fetch(:platform)}",
-            IMAGE_VERSION,
           ]
         end
       end

test/test_starter.rb

@@ -49,20 +49,20 @@ def test_container_image_name
 
     # mri platform arg
     assert_equal(
-      "ghcr.io/rake-compiler/rake-compiler-dock-mri-platform-option-value:#{IMAGE_VERSION}",
+      "ghcr.io/rake-compiler/rake-compiler-dock-image:#{IMAGE_VERSION}-mri-platform-option-value",
       Starter.container_image_name({:platform => "platform-option-value"}),
     )
 
     # jruby rubyvm arg
     assert_equal(
-      "ghcr.io/rake-compiler/rake-compiler-dock-jruby:#{IMAGE_VERSION}",
+      "ghcr.io/rake-compiler/rake-compiler-dock-image:#{IMAGE_VERSION}-jruby",
       Starter.container_image_name({:rubyvm => "jruby"}),
     )
 
     # container registry env var
     with_env({"CONTAINER_REGISTRY" => "registry-value"}) do
       assert_equal(
-        "registry-value/rake-compiler-dock-mri-x86_64-darwin:#{IMAGE_VERSION}",
+        "registry-value/rake-compiler-dock-image:#{IMAGE_VERSION}-mri-x86_64-darwin",
         Starter.container_image_name({:platform => "x86_64-darwin"}),
       )
     end