Skip to content

toolchain: use latest 2.0 Mariner container for bootstrap build #5728

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.

Sign up for GitHub

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

Merged
anphel31 merged 3 commits into from
Jun 22, 2023
Merged

toolchain: use latest 2.0 Mariner container for bootstrap build #5728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcb00b2
use mcr.microsoft.com/cbl-mariner/base/core:2.0.20230609
anphel31 Jun 21, 2023
d6e3d8b
update cgmanifest
anphel31 Jun 21, 2023
292ed77
install tar
anphel31 Jun 22, 2023
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 toolkit/scripts/toolchain/cgmanifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"Type": "DockerImage",
"DockerImage": {
"Name": "mcr.microsoft.com/cbl-mariner/base/core",
"Digest": "sha256:0a92146c52c59d25475e93d2acb0d7011af9411a57e237750eee7dd7c4fbbe59",
"Tag": "1.0.20220226"
"Digest": "sha256:c159685dca0d770885dbdbe3b39a43537acaba2d61c3c08a86b975b77f87155e",
"Tag": "2.0.20230609"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion toolkit/scripts/toolchain/container/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
# Dockerfile to Mariner toolchain from scratch
#
FROM mcr.microsoft.com/cbl-mariner/base/core:1.0.20220226
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20230609

# Tag the layers so we can clean up all the containers associated with a build directory
ARG MARINER_BUILD_DIR
Expand Down Expand Up @@ -34,6 +34,7 @@ RUN tdnf install -y \
perl \
rpm \
sudo \
tar \
texinfo \
unzip \
vim \
Expand Down