From a2135982bccea3593972c681e3f922e3f89134a4 Mon Sep 17 00:00:00 2001 From: Barry Gordon Date: Thu, 24 Feb 2022 20:01:11 +0000 Subject: [PATCH] Update containers to the latest release SHAs --- __tests__/docker-tags.test.ts | 9 +++++++-- dist/main/index.js | 2 +- docker/Dockerfile.proxy | 2 +- docker/Dockerfile.updater | 2 +- docker/containers.json | 4 ++-- src/update-containers.ts | 2 +- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/__tests__/docker-tags.test.ts b/__tests__/docker-tags.test.ts index 91a4344..16c4695 100644 --- a/__tests__/docker-tags.test.ts +++ b/__tests__/docker-tags.test.ts @@ -1,15 +1,20 @@ import {UPDATER_IMAGE_NAME, PROXY_IMAGE_NAME} from '../src/docker-tags' +import {getImageName} from '../src/update-containers' describe('Docker tags', () => { - test('UPDATER_IMAGE_NAME', () => { + 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}$/ ) + + expect(UPDATER_IMAGE_NAME).toEqual(getImageName('Dockerfile.updater')) }) - test('PROXY_IMAGE_NAME', () => { + 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}$/ ) + + expect(PROXY_IMAGE_NAME).toEqual(getImageName('Dockerfile.proxy')) }) }) diff --git a/dist/main/index.js b/dist/main/index.js index 5516d0b..2b63ecc 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:79b4f9cd5cd93062ee3403c71bbc5ca1939b8fc27f88cf705d6604b738b0c907","updater":"docker.pkg.github.com/dependabot/dependabot-updater@sha256:58e10e8dad0e79c532fe439161857c09da0ce4f8bbabbe216cd87dd35a39573b"}'); +module.exports = JSON.parse('{"proxy":"docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:208134c602d749400c050b03469dbe6d38af64363492f0f70ea5aba916f32ff9","updater":"docker.pkg.github.com/dependabot/dependabot-updater@sha256:3d6c07043f4f2baf32047634a00a6581cf1124f12a30dcc859ab128f24333a3a"}'); /***/ }), diff --git a/docker/Dockerfile.proxy b/docker/Dockerfile.proxy index d9d9aed..0539199 100644 --- a/docker/Dockerfile.proxy +++ b/docker/Dockerfile.proxy @@ -1 +1 @@ -FROM docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:79b4f9cd5cd93062ee3403c71bbc5ca1939b8fc27f88cf705d6604b738b0c907 +FROM docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:208134c602d749400c050b03469dbe6d38af64363492f0f70ea5aba916f32ff9 diff --git a/docker/Dockerfile.updater b/docker/Dockerfile.updater index 49c7e96..1b94fc0 100644 --- a/docker/Dockerfile.updater +++ b/docker/Dockerfile.updater @@ -1 +1 @@ -FROM docker.pkg.github.com/dependabot/dependabot-updater@sha256:58e10e8dad0e79c532fe439161857c09da0ce4f8bbabbe216cd87dd35a39573b +FROM docker.pkg.github.com/dependabot/dependabot-updater@sha256:3d6c07043f4f2baf32047634a00a6581cf1124f12a30dcc859ab128f24333a3a diff --git a/docker/containers.json b/docker/containers.json index 0653cdd..cae0d9a 100644 --- a/docker/containers.json +++ b/docker/containers.json @@ -1,4 +1,4 @@ { - "proxy": "docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:79b4f9cd5cd93062ee3403c71bbc5ca1939b8fc27f88cf705d6604b738b0c907", - "updater": "docker.pkg.github.com/dependabot/dependabot-updater@sha256:58e10e8dad0e79c532fe439161857c09da0ce4f8bbabbe216cd87dd35a39573b" + "proxy": "docker.pkg.github.com/github/dependabot-update-job-proxy@sha256:208134c602d749400c050b03469dbe6d38af64363492f0f70ea5aba916f32ff9", + "updater": "docker.pkg.github.com/dependabot/dependabot-updater@sha256:3d6c07043f4f2baf32047634a00a6581cf1124f12a30dcc859ab128f24333a3a" } \ No newline at end of file diff --git a/src/update-containers.ts b/src/update-containers.ts index e9c56a0..009e665 100644 --- a/src/update-containers.ts +++ b/src/update-containers.ts @@ -1,6 +1,6 @@ import fs from 'fs' -function getImageName(dockerfileName: string): String { +export function getImageName(dockerfileName: string): String { const dockerfile = fs.readFileSync( require.resolve(`../docker/${dockerfileName}`), 'utf8'