From ebac80ddb5f2d97d0fd7944bae745b5d29052f0a Mon Sep 17 00:00:00 2001 From: Joe D'Amore Date: Mon, 2 Dec 2024 15:27:43 -0500 Subject: [PATCH 1/2] Allow Docker registry to be overridden via `IMAGE_REGISTRY` arg --- packages/manager/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/manager/Dockerfile b/packages/manager/Dockerfile index 37e1785a48a..d7ba0a3eb4d 100644 --- a/packages/manager/Dockerfile +++ b/packages/manager/Dockerfile @@ -1,8 +1,12 @@ +# Registry to use when pulling images. +# Defaults to Docker Hub, but can be overriden to point to another registry if needed. +ARG IMAGE_REGISTRY=docker.io + # Node.js base image for Cloud Manager CI tasks. # # Extends from the Node.js base image that corresponds with our latest supported # version of Node, and includes other tools that we rely on like pnpm and bun. -FROM node:20.17-bullseye-slim as nodejs-cloud-manager +FROM ${IMAGE_REGISTRY}/node:20.17-bullseye-slim as nodejs-cloud-manager RUN npm install -g pnpm bun # `manager` @@ -28,7 +32,7 @@ CMD yarn start:manager:ci # # Builds an image containing Cypress and miscellaneous system utilities required # by the tests. -FROM cypress/included:13.11.0 as e2e-build +FROM ${IMAGE_REGISTRY}/cypress/included:13.11.0 as e2e-build RUN npm install -g pnpm bun USER node WORKDIR /home/node/app From af4aa43dda27a0948b1a1aa7db4514c2a6ea49c8 Mon Sep 17 00:00:00 2001 From: Joe D'Amore Date: Tue, 10 Dec 2024 09:43:57 -0500 Subject: [PATCH 2/2] Add changeset --- .../.changeset/pr-11360-tech-stories-1733774598326.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/manager/.changeset/pr-11360-tech-stories-1733774598326.md diff --git a/packages/manager/.changeset/pr-11360-tech-stories-1733774598326.md b/packages/manager/.changeset/pr-11360-tech-stories-1733774598326.md new file mode 100644 index 00000000000..2d63e9c5432 --- /dev/null +++ b/packages/manager/.changeset/pr-11360-tech-stories-1733774598326.md @@ -0,0 +1,5 @@ +--- +"@linode/manager": Tech Stories +--- + +Add `IMAGE_REGISTRY` Docker build argument ([#11360](https://github.com/linode/manager/pull/11360))