Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

azlinux3: use images from mcr #353

Merged
merged 1 commit into from
Aug 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/azlinux/azlinux3.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
9 changes: 6 additions & 3 deletions website/docs/targets.md
Original file line number Diff line number Diff line change
Expand Up @@ -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=<new ref>`
2. A build context named `dalec-mariner2-worker`
i. `--build-context dalec-azlinux3-worker=<new ref>`