Skip to content

Upgrade CBL-Mariner to 2.0.20250207 #1306

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
merged 2 commits into from
Feb 18, 2025
Merged

Upgrade CBL-Mariner to 2.0.20250207 #1306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6af82a2
Upgrade CBL-Mariner to 2.0.20250207
Feb 12, 2025
4d9cd10
fix source storage path for Mesa
Feb 13, 2025
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 Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Create a builder image with the compilers, etc. needed
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20240829 AS build-env
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20250207 AS build-env

# Install all the required packages for building. This list is probably
# longer than necessary.
Expand Down Expand Up @@ -306,7 +306,7 @@ RUN if [ -z "$SYSTEMDISTRO_DEBUG_BUILD" ] ; then \

## Create the distro image with just what's needed at runtime

FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20240829 AS runtime
FROM mcr.microsoft.com/cbl-mariner/base/core:2.0.20250207 AS runtime

RUN echo "== Install Core/UI Runtime Dependencies ==" && \
tdnf install -y \
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ stages:

- template: devops/common-linux.yml

- script: wget https://cblmarinerstorage.blob.core.windows.net/sources/core/mesa-23.1.0.tar.xz &&
- script: wget https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/mesa-23.1.0.tar.xz &&
tar -xvf mesa-23.1.0.tar.xz
displayName: 'Download Mesa from CBL Mariner'

Expand Down Expand Up @@ -186,7 +186,7 @@ stages:
sudo service docker restart
displayName: 'Enable Docker Engine experimental '

- script: wget https://cblmarinerstorage.blob.core.windows.net/sources/core/mesa-23.1.0.tar.xz &&
- script: wget https://azurelinuxsrcstorage.blob.core.windows.net/sources/core/mesa-23.1.0.tar.xz &&
tar -xvf mesa-23.1.0.tar.xz
displayName: 'Download Mesa from CBL Mariner'

Expand Down