change snapshots to push to the same repository

Author: flavorjones

.github/workflows/publish-images.yml

@@ -39,11 +39,18 @@ jobs:
         with:
           ruby-version: "3.1"
           bundler-cache: true
-      - id: rcd_image_version
-        run: bundle exec ruby -e 'require "rake_compiler_dock"; puts "rcd_image_version=#{RakeCompilerDock::IMAGE_VERSION}"' >> $GITHUB_OUTPUT
+      - id: rcd_config
+        run: |
+          bundle exec ruby -e ' \
+            require "rake_compiler_dock" \
+            print "image_name=" \
+            puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}})) \
+            print "snapshot_name=" \
+            puts RakeCompilerDock::Starter.container_image_name(:platform => %q(${{matrix.platform}}), :version => %q(snapshot)) \
+          ' | tee -a $GITHUB_OUTPUT
+
       - name: Build docker image
         env:
-          CONTAINER_REGISTRY: phony-registry
           RCD_DOCKER_BUILD: docker buildx build --cache-from=type=local,src=tmp/build-cache --cache-to=type=local,dest=tmp/build-cache-new --load
         run: |
           docker buildx create --driver docker-container --use
@@ -56,10 +63,7 @@ jobs:
           registry: ghcr.io
           username: ${{github.actor}}
           password: ${{secrets.GITHUB_TOKEN}}
-      - env:
-          OLD_TAG: phony-registry/rake-compiler-dock-${{matrix.tag || format('mri-{0}', matrix.platform)}}:${{steps.rcd_image_version.outputs.rcd_image_version}}
-          NEW_TAG: ghcr.io/rake-compiler/rake-compiler-dock-snapshot:${{matrix.platform}}
-        run: |
+      - run: |
           docker images
-          docker tag ${OLD_TAG} ${NEW_TAG}
-          docker push ${NEW_TAG}
+          docker tag ${{steps.rcd_config.outputs.image_name}} ${{steps.rcd_config.outputs.snapshot_name}}
+          docker push ${{steps.rcd_config.outputs.snapshot_name}}

README.md

@@ -221,11 +221,9 @@ For an example of rake tasks that support this style of invocation, visit https:
 
 ### Living on the edge: using weekly snapshots
 
-OCI images snapshotted from `master` are published weekly to Github Container Registry:
+OCI images snapshotted from `master` are published weekly to Github Container Registry with the string "snapshot" in place of the version number in the tag name, e.g.:
 
-> https://github.com/rake-compiler/rake-compiler-dock/pkgs/container/rake-compiler-dock-snapshot
-
-The images are named `ghcr.io/rake-compiler/rake-compiler-dock-snapshot` and are tagged with the platform name (e.g., `ghcr.io/rake-compiler/rake-compiler-dock-snapshot:x86_64-linux`.
+- `ghcr.io/rake-compiler/rake-compiler-dock-image:snapshot-mri-x86_64-linux`
 
 These images are intended for integration testing. They may not work properly and should not be considered production ready.
 

lib/rake_compiler_dock/starter.rb

@@ -166,7 +166,7 @@ def container_image_name(options={})
 
           "%s/rake-compiler-dock-image:%s-%s%s" % [
             container_registry,
-            IMAGE_VERSION,
+            options.fetch(:version) { IMAGE_VERSION },
             container_rubyvm(options),
             container_jrubyvm?(options) ? "" : "-#{options.fetch(:platform)}",
           ]

test/test_starter.rb

@@ -66,6 +66,12 @@ def test_container_image_name
         Starter.container_image_name({:platform => "x86_64-darwin"}),
       )
     end
+
+    # snapshots
+    assert_equal(
+      "ghcr.io/rake-compiler/rake-compiler-dock-image:snapshot-mri-x86_64-darwin",
+      Starter.container_image_name({:platform =>"x86_64-darwin", :version => "snapshot"}),
+    )
   end
 
   def test_container_registry