Skip to content

Commit

Permalink
{Packaging} Build RPM with Mariner 2.0 image (Azure#21245)
Browse files Browse the repository at this point in the history
  • Loading branch information
jiasli authored Mar 11, 2022
1 parent 06d3fa7 commit c6f89e9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scripts/release/rpm/Dockerfile.mariner
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

0 comments on commit c6f89e9

Please sign in to comment.