From ab30b98f5483ea72725c1abeb292b8488512ae1b Mon Sep 17 00:00:00 2001 From: Barry Gordon Date: Tue, 15 Mar 2022 15:15:58 +0000 Subject: [PATCH] Switch from GHPR to GHCR for images --- __tests__/docker-tags.test.ts | 8 ++++---- dist/cleanup/index.js | 2 +- dist/main/index.js | 2 +- docker/Dockerfile.proxy | 2 +- docker/Dockerfile.updater | 2 +- docker/containers.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/__tests__/docker-tags.test.ts b/__tests__/docker-tags.test.ts index 4450925..55efd51 100644 --- a/__tests__/docker-tags.test.ts +++ b/__tests__/docker-tags.test.ts @@ -8,7 +8,7 @@ import {getImageName} from '../src/update-containers' describe('Docker tags', () => { test('UPDATER_IMAGE_NAME uses a pinned version and matches the config Dockerfile', () => { expect(UPDATER_IMAGE_NAME).toMatch( - /^docker\.pkg\.github\.com\/dependabot\/dependabot-updater@sha256:[a-zA-Z0-9]{64}$/ + /^ghcr\.io\/dependabot\/dependabot-updater\/dependabot-updater@sha256:[a-zA-Z0-9]{64}$/ ) expect(UPDATER_IMAGE_NAME).toEqual(getImageName('Dockerfile.updater')) @@ -16,7 +16,7 @@ describe('Docker tags', () => { test('PROXY_IMAGE_NAME uses a pinned version and matches the config Dockerfile', () => { expect(PROXY_IMAGE_NAME).toMatch( - /^docker\.pkg\.github\.com\/github\/dependabot-update-job-proxy@sha256:[a-zA-Z0-9]{64}$/ + /^ghcr\.io\/github\/dependabot-update-job-proxy\/dependabot-update-job-proxy@sha256:[a-zA-Z0-9]{64}$/ ) expect(PROXY_IMAGE_NAME).toEqual(getImageName('Dockerfile.proxy')) @@ -24,11 +24,11 @@ describe('Docker tags', () => { test('repositoryName returns the image name minus the tagged version or reference for our real values', () => { expect(repositoryName(UPDATER_IMAGE_NAME)).toMatch( - 'docker.pkg.github.com/dependabot/dependabot-updater' + 'ghcr.io/dependabot/dependabot-updater/dependabot-updater' ) expect(repositoryName(PROXY_IMAGE_NAME)).toMatch( - 'docker.pkg.github.com/github/dependabot-update-job-proxy' + 'ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy' ) }) diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index b97dcc6..14f0d73 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -5,7 +5,7 @@ require('./sourcemap-register.js');/******/ (() => { // webpackBootstrap /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"proxy":"docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c","updater":"docker.pkg.github.com/dependabot/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133"}'); +module.exports = JSON.parse('{"proxy":"ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c","updater":"ghcr.io/dependabot/dependabot-updater/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133"}'); /***/ }), diff --git a/dist/main/index.js b/dist/main/index.js index a225306..b7a5f11 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -5,7 +5,7 @@ require('./sourcemap-register.js');/******/ (() => { // webpackBootstrap /***/ ((module) => { "use strict"; -module.exports = JSON.parse('{"proxy":"docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c","updater":"docker.pkg.github.com/dependabot/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133"}'); +module.exports = JSON.parse('{"proxy":"ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c","updater":"ghcr.io/dependabot/dependabot-updater/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133"}'); /***/ }), diff --git a/docker/Dockerfile.proxy b/docker/Dockerfile.proxy index 3de211e..f9a9092 100644 --- a/docker/Dockerfile.proxy +++ b/docker/Dockerfile.proxy @@ -1 +1 @@ -FROM docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c +FROM ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c diff --git a/docker/Dockerfile.updater b/docker/Dockerfile.updater index 1faabe4..dacc584 100644 --- a/docker/Dockerfile.updater +++ b/docker/Dockerfile.updater @@ -1 +1 @@ -FROM docker.pkg.github.com/dependabot/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133 +FROM ghcr.io/dependabot/dependabot-updater/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133 diff --git a/docker/containers.json b/docker/containers.json index 40e001f..77ef12d 100644 --- a/docker/containers.json +++ b/docker/containers.json @@ -1,4 +1,4 @@ { - "proxy": "docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c", - "updater": "docker.pkg.github.com/dependabot/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133" + "proxy": "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy@sha256:21ca670ef8ef375e4168be3e1cedfe1a165724314299e147303cbeae57d6ba3c", + "updater": "ghcr.io/dependabot/dependabot-updater/dependabot-updater@sha256:2b7f7c1905471943879183e67e0ec6b083184824f5ee608852e318a0181dc133" } \ No newline at end of file