Try supporting tags with SHAs

github · Dec 7, 2022 · b6032e8 · b6032e8
1 parent 8851eca
commit b6032e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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(
-      /^ghcr\.io\/dependabot\/dependabot-updater@sha256:[a-zA-Z0-9]{64}$/
+      /^ghcr\.io\/dependabot\/dependabot-updater:v\d.\d.\d{14}@sha256:[a-zA-Z0-9]{64}$/
     )
 
     expect(UPDATER_IMAGE_NAME).toEqual(getImageName('Dockerfile.updater'))

diff --git a/docker/containers.json b/docker/containers.json
@@ -1,4 +1,4 @@
 {
   "proxy": "ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy@sha256:1942aea0f57a3652d7694390dd4d8e6d08abca84b89383ee7ef9c6b57e00d247",
-  "updater": "ghcr.io/dependabot/dependabot-updater@sha256:6030d5a8cd23246af8fc0276c906316fbd166d7a400479b1b87589aea7abcac9"
+  "updater": "ghcr.io/dependabot/dependabot-updater:v2.0.20221206153122@sha256:6030d5a8cd23246af8fc0276c906316fbd166d7a400479b1b87589aea7abcac9"
 }
diff --git a/src/docker-tags.ts b/src/docker-tags.ts
@@ -5,7 +5,7 @@ export const UPDATER_IMAGE_NAME = dockerContainerConfig.updater
 export const PROXY_IMAGE_NAME = dockerContainerConfig.proxy
 
 const imageNamePattern =
-  '^(?<repository>(([a-zA-Z0-9._-]+([:[0-9]+[^/]))?([a-zA-Z0-9._/-]+)?))((:[a-zA-Z0-9._/-]+)|(@sha256:[a-zA-Z0-9]{64}))?$'
+  '^(?<repository>(([a-zA-Z0-9._-]+([:[0-9]+[^/]))?([a-zA-Z0-9._/-]+)?))(:[a-zA-Z0-9._/-]+)?(@sha256:[a-zA-Z0-9]{64})?$'
 
 export function repositoryName(imageName: string): string {
   const match = imageName.match(imageNamePattern)