From 8262073fc470bde36cdccc57d2c4dfbcc3473aa6 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Wed, 21 Aug 2024 17:21:46 -0700 Subject: [PATCH] azlinux3: use images from mcr ... since these are available now Signed-off-by: Brian Goff --- frontend/azlinux/azlinux3.go | 4 ++-- website/docs/targets.md | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frontend/azlinux/azlinux3.go b/frontend/azlinux/azlinux3.go index dee1ba6e..c09b074a 100644 --- a/frontend/azlinux/azlinux3.go +++ b/frontend/azlinux/azlinux3.go @@ -17,10 +17,10 @@ const ( tdnfCacheNameAzlinux3 = "azlinux3-tdnf-cache" // Azlinux3Ref is the image ref used for the base worker image - Azlinux3Ref = "azurelinuxpreview.azurecr.io/public/azurelinux/base/core:3.0" + Azlinux3Ref = "mcr.microsoft.com/azurelinux/base/core:3.0" // Azlinux3WorkerContextName is the build context name that can be used to lookup Azlinux3WorkerContextName = "dalec-azlinux3-worker" - azlinux3DistrolessRef = "azurelinuxpreview.azurecr.io/public/azurelinux/distroless/base:3.0" + azlinux3DistrolessRef = "mcr.microsoft.com/azurelinux/distroless/base:3.0" ) func NewAzlinux3Handler() gwclient.BuildFunc { diff --git a/website/docs/targets.md b/website/docs/targets.md index bf01ffb0..cf58fda5 100644 --- a/website/docs/targets.md +++ b/website/docs/targets.md @@ -108,6 +108,9 @@ In the `mariner2` target, Dalec looks for a named context called either If 1 is provided, then 2 is ignored. -This works the same way in the `azlinux3` target but with the `azlinux3` base image -(not currently displayed here since it is still preview, this will be updated -once azlinux3 is GA) OR a build context named `dalec-azlinux3-worker`. +This works the same way in the `azlinux3`: + +1. The actual base image used internally for azlinux3 + i. `--build-context mcr.microsoft.com/azurelinux/base/core:3.0=` +2. A build context named `dalec-mariner2-worker` + i. `--build-context dalec-azlinux3-worker=`