Merge pull request #1377 from alphagov/namespace-github-packages

Add govuk/ namespace for images in ghcr.io
alphagov · Jul 9, 2024 · 510ad41 · 510ad41
2 parents 297182c + 6d9e56c
commit 510ad41
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml
@@ -71,7 +71,7 @@ jobs:
         with:
           images: |
             ${{ steps.login-ecr.outputs.registry }}/${{ inputs.ecrRepositoryName }}
-            ghcr.io/${{ github.repository_owner }}/${{ inputs.ecrRepositoryName }}
+            ghcr.io/${{ github.repository_owner }}/govuk/${{ inputs.ecrRepositoryName }}
           tags: |
             type=raw,priority=500,value=${{ inputs.gitRef }},enable=${{ startsWith(inputs.gitRef, 'v') }}
             type=raw,priority=400,value=${{ steps.local-head.outputs.sha }},enable=${{ !startsWith(inputs.gitRef, 'v') }}

diff --git a/.github/workflows/build-and-push-multiarch-image.yml b/.github/workflows/build-and-push-multiarch-image.yml
@@ -81,7 +81,7 @@ jobs:
         with:
           images: |
             ${{ steps.login-ecr.outputs.registry }}/${{ inputs.ecrRepositoryName }}
-            ghcr.io/${{ github.repository_owner }}/${{ inputs.ecrRepositoryName }}
+            ghcr.io/${{ github.repository_owner }}/govuk/${{ inputs.ecrRepositoryName }}
           labels: |
             org.opencontainers.image.vendor=GDS
           tags: |
@@ -166,7 +166,7 @@ jobs:
         with:
           images: |
             ${{ steps.login-ecr.outputs.registry }}/${{ inputs.ecrRepositoryName }}
-            ghcr.io/${{ github.repository_owner }}/${{ inputs.ecrRepositoryName }}
+            ghcr.io/${{ github.repository_owner }}/govuk/${{ inputs.ecrRepositoryName }}
           labels: |
             org.opencontainers.image.vendor=GDS
           tags: |

diff --git a/terraform/deployments/ecr/main.tf b/terraform/deployments/ecr/main.tf
@@ -80,7 +80,7 @@ resource "aws_ecr_repository" "repositories" {
 
 resource "aws_ecr_repository" "github_repositories" {
   for_each             = toset(local.repositories)
-  name                 = "github/alphagov/${each.key}"
+  name                 = "github/alphagov/govuk/${each.key}"
   image_tag_mutability = "MUTABLE" # To support a movable `latest` for developer convenience.
   image_scanning_configuration { scan_on_push = true }
 }