change location of docker images to ghcr.io

Author: flavorjones

.github/workflows/ci.yml

@@ -59,6 +59,7 @@ jobs:
         run: |
           docker buildx create --driver docker-container --use
           bundle exec rake build:${PLATFORM} RCD_DOCKER_BUILD="docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new --load"
+          docker images
 
       - name: Move build cache and remove outdated layers
         run: |

History.md

@@ -9,7 +9,16 @@
 * 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-jruby`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-mri-aarch64-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-mri-arm-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-mri-x64-mingw-ucrt`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-mri-x64-mingw32`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-mri-x86-linux`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-mri-x86-mingw32`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-mri-x86_64-darwin`
+  * `ghcr.io/rake-compiler/rake-compiler-dock-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-mri-x86_64-linux:1.2.1"
     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-PLATFORM:IMAGE_VERSION" with an image version that is determined by the gem version.
 
 The following variables are passed through to the docker container without modification:
 

Rakefile

@@ -6,7 +6,7 @@ require_relative "build/parallel_docker_build"
 
 RakeCompilerDock::GemHelper.install_tasks
 
-DOCKERHUB_USER = ENV['DOCKERHUB_USER'] || "larskanis"
+DOCKER_REGISTRY = ENV['DOCKERHUB_USER'] || ENV['DOCKER_REGISTRY'] || "ghcr.io/rake-compiler"
 docker_build_cmd = Shellwords.split(ENV['RCD_DOCKER_BUILD'] || "docker build")
 
 platforms = [
@@ -29,7 +29,7 @@ namespace :build do
     desc "Build image for platform #{platform}"
     task platform => sdf
     task sdf do
-      sh(*docker_build_cmd, "-t", "#{DOCKERHUB_USER}/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}", "-f", "Dockerfile.mri.#{platform}", ".")
+      sh(*docker_build_cmd, "-t", "#{DOCKER_REGISTRY}/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}", "-f", "Dockerfile.mri.#{platform}", ".")
     end
 
     df = ERB.new(File.read("Dockerfile.mri.erb"), trim_mode: ">").result(binding)
@@ -40,7 +40,7 @@ namespace :build do
   desc "Build image for JRuby"
   task :jruby => "Dockerfile.jruby"
   task "Dockerfile.jruby" do
-    sh(*docker_build_cmd, "-t", "#{DOCKERHUB_USER}/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION}", "-f", "Dockerfile.jruby", ".")
+    sh(*docker_build_cmd, "-t", "#{DOCKER_REGISTRY}/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION}", "-f", "Dockerfile.jruby", ".")
   end
 
   RakeCompilerDock::ParallelDockerBuild.new(platforms.map{|pl, _| "Dockerfile.mri.#{pl}" } + ["Dockerfile.jruby"], workdir: "tmp/docker", docker_build_cmd: docker_build_cmd)
@@ -57,7 +57,7 @@ task :build => "build:all"
 namespace :prepare do
   desc "Build cross compiler for x64-mingw-ucrt aka RubyInstaller-3.1+"
   task "mingw64-ucrt" do
-    sh(*docker_build_cmd, "-t", "#{DOCKERHUB_USER}/mingw64-ucrt:20.04", ".",
+    sh(*docker_build_cmd, "-t", "#{DOCKER_REGISTRY}/mingw64-ucrt:20.04", ".",
        chdir: "mingw64-ucrt")
   end
 end
@@ -92,11 +92,11 @@ end
 namespace :release do
   desc "push all docker images"
   task :images do
-    jimg = "#{DOCKERHUB_USER}/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION}"
+    jimg = "#{DOCKER_REGISTRY}/rake-compiler-dock-jruby:#{RakeCompilerDock::IMAGE_VERSION}"
     sh "docker", "push", jimg
 
     platforms.each do |platform, _|
-      img = "#{DOCKERHUB_USER}/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}"
+      img = "#{DOCKER_REGISTRY}/rake-compiler-dock-mri-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}"
       sh "docker", "push", img
     end
   end

lib/rake_compiler_dock/starter.rb

@@ -49,7 +49,7 @@ def exec(*args)
             platform_postfix = jrubyvm ? "" : "-#{platform}"
             ENV['RCD_IMAGE'] ||
                 ENV['RAKE_COMPILER_DOCK_IMAGE'] ||
-                "larskanis/rake-compiler-dock-#{rubyvm}#{platform_postfix}:#{IMAGE_VERSION}"
+                "ghcr.io/rake-compiler/rake-compiler-dock-#{rubyvm}#{platform_postfix}:#{IMAGE_VERSION}"
           end
 
           check = check_docker(mountdir) if options.fetch(:check_docker){ true }

test/test_environment_variables.rb

@@ -9,11 +9,11 @@
 class TestEnvironmentVariables
   module Common
     TEST_PLATFORM = ENV["TEST_PLATFORM"] || "x64-mingw-ucrt"
-    DOCKERHUB_USER = ENV['DOCKERHUB_USER'] || "larskanis"
+    DOCKER_REGISTRY = ENV['DOCKERHUB_USER'] || ENV['DOCKER_REGISTRY'] || "ghcr.io/rake-compiler"
 
     IS_JRUBY = TEST_PLATFORM.to_s == "jruby"
     platform = IS_JRUBY ? "jruby" : "mri-#{TEST_PLATFORM}"
-    TEST_IMAGE_NAME = "#{DOCKERHUB_USER}/rake-compiler-dock-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}"
+    TEST_IMAGE_NAME = "#{DOCKER_REGISTRY}/rake-compiler-dock-#{platform}:#{RakeCompilerDock::IMAGE_VERSION}"
 
     def rcd_env
       self.class.instance_variable_get("@rcd_env") || begin