Switch to GitHub Container Registry

houseabsolute · Mar 17, 2023 · ad4b769 · ad4b769
1 parent 60bcf15
commit ad4b769
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 8 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,12 @@
+## 0.3.0 2023-03-16
+
+* Images are now stored in the GitHub Container registry rather than Docker
+  Hub. Unfortunately, because of upcoming Docker Hub changes, all images from
+  previous versions will be deleted soon. If you've pinned your use of these
+  helpers to an earlier version, then your CI will stop working when those
+  images are deleted.
+
+
 ## 0.2.3 2022-10-22
 
 * Fixed a bug in the templates where they would always attempt to call

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -64,12 +64,12 @@ stages:
             displayName: Log in to Docker Hub
             inputs:
               command: login
-              containerRegistry: DockerHubHouseabsolute
+              containerRegistry: GitHub Container Registry
           - task: Docker@2
             displayName: Build and push tools-perl image
             inputs:
               command: buildAndPush
-              containerRegistry: DockerHubHouseabsolute
+              containerRegistry: GitHub Container Registry
               repository: houseabsolute/ci-perl-helpers-ubuntu
               tags: |
                 $(WriteToolsPerlDockerfile.base_image_tag0)
@@ -123,11 +123,11 @@ stages:
             displayName: Log in to Docker Hub
             inputs:
               command: login
-              containerRegistry: DockerHubHouseabsolute
+              containerRegistry: GitHub Container Registry
           - task: Docker@2
             displayName: Build and push runtime-perl image for perl=$(perl), threads=$(threads)
             inputs:
               command: buildAndPush
-              containerRegistry: DockerHubHouseabsolute
+              containerRegistry: GitHub Container Registry
               repository: houseabsolute/ci-perl-helpers-ubuntu
               tags: $(tags)
diff --git a/deploy/lib/D/WriteRuntimePerlDockerfile.pm b/deploy/lib/D/WriteRuntimePerlDockerfile.pm
@@ -156,6 +156,7 @@ COPY ./tools /usr/local/ci-perl-helpers-tools
 RUN chown -R 1001:1001 /usr/local/perl5
 
 LABEL maintainer="Dave Rolsky <[email protected]>"
+LABEL org.opencontainers.image.source=https://github.com/houseabsolute/ci-perl-helpers
 EOF
 }
 

diff --git a/deploy/lib/D/WriteToolsPerlDockerfile.pm b/deploy/lib/D/WriteToolsPerlDockerfile.pm
@@ -115,6 +115,7 @@ RUN perlbrew exec --with tools-perl \
     && rm -fr /root/.perl-cpm
 
 LABEL maintainer="Dave Rolsky <[email protected]>"
+LABEL org.opencontainers.image.source=https://github.com/houseabsolute/ci-perl-helpers
 EOF
 }
 ## use critic

diff --git a/deploy/lib/R/Tagger.pm b/deploy/lib/R/Tagger.pm
@@ -46,7 +46,7 @@ sub _build_image_versions {
     return [ sort @versions ];
 }
 
-my $TagRoot = 'houseabsolute/ci-perl-helpers-ubuntu';
+my $TagRoot = 'ghcr.io/houseabsolute/ci-perl-helpers-ubuntu';
 
 ## no critic (Subroutines::ProhibitUnusedPrivateSubroutines)
 sub _tag_root {$TagRoot}

diff --git a/dev/test-local-docker-build.pl b/dev/test-local-docker-build.pl
@@ -231,7 +231,7 @@
         }
 
         return sprintf( <<'EOF', $from_tag, $distro, $cpm );
-FROM houseabsolute/ci-perl-helpers-ubuntu:%s
+FROM ghcr.io/houseabsolute/ci-perl-helpers-ubuntu:%s
 
 RUN useradd -m -u 1001 vsts_azpcontainer
 

diff --git a/matrix/lib/M/TestMatrixPrinter.pm b/matrix/lib/M/TestMatrixPrinter.pm
@@ -637,7 +637,7 @@ sub _base_job {
 
     if ( $self->{os} eq 'Linux' ) {
         $job{container} = sprintf(
-            'houseabsolute/ci-perl-helpers-ubuntu:%s%s-%s',
+            'ghcr.io/houseabsolute/ci-perl-helpers-ubuntu:%s%s-%s',
             $perl_param,
             ( $threads ? '-threads' : q{} ),
             $self->{image_version},

diff --git a/templates/helpers/build.yml b/templates/helpers/build.yml
@@ -28,7 +28,7 @@ stages:
           image_version: $[ dependencies.SetImageVersion.outputs['ImageVersionProducer.image_version'] ]
         pool:
           vmImage: ubuntu-20.04
-        container: houseabsolute/ci-perl-helpers-ubuntu:5.30.2-$(image_version)
+        container: ghcr.io/houseabsolute/ci-perl-helpers-ubuntu:5.30.2-$(image_version)
         steps:
           - bash: /usr/local/ci-perl-helpers-tools/bin/with-perl tools-perl show-env.pl
             displayName: Show environment