Skip to content

{Packaging} Build RPM with Mariner 2.0 image #21245

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
jiasli merged 3 commits into from
Mar 11, 2022
Merged

{Packaging} Build RPM with Mariner 2.0 image #21245

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0e9ab6
Build RPM with mariner 2.0 image
jiasli Feb 10, 2022
3349337
update
jiasli Feb 10, 2022
7587a96
Apply suggestions from code review
jiasli Mar 11, 2022
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
6 changes: 3 additions & 3 deletions scripts/release/rpm/Dockerfile.mariner
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG tag=1.0
ARG tag=2.0

FROM cblmariner.azurecr.io/base/core:${tag} AS build-env
FROM cblmariner2preview.azurecr.io/base/core:${tag} AS build-env
ARG cli_version=dev

RUN tdnf update -y
Expand All @@ -14,7 +14,7 @@ RUN dos2unix ./scripts/release/rpm/azure-cli.spec && \
REPO_PATH=$(pwd) CLI_VERSION=$cli_version rpmbuild -v -bb --clean scripts/release/rpm/azure-cli.spec && \
cp /usr/src/mariner/RPMS/x86_64/azure-cli-${cli_version}-1.x86_64.rpm /azure-cli-dev.rpm

FROM cblmariner.azurecr.io/base/core:${tag} AS execution-env
FROM cblmariner2preview.azurecr.io/base/core:${tag} AS execution-env

RUN tdnf update -y
RUN tdnf install -y python3 python3-virtualenv
Expand Down