[Packaging] Add Dockerfile.mariner to support Mariner build by mfrw · Pull Request #20061 · Azure/azure-cli

mfrw · 2021-10-27T05:38:01Z

[Packaging] Add Dockerfile for mariner
[Packaging] Update Readme to reflect mariner build steps
[Packaging] Fix test for fedora Dockerfile

Description

Add docker build support for creating azure-cli.rpm for CBL-Mariner.
Update the Readme to document mariner specific build.
Update Dockerfile.fedora to include the az --version.

Testing Guide

Created a dev rpm and tested it with installation & uninstallation.

Step 14/14 : RUN rpm -i ./azure-cli-*-1*.rpm &&     az --version
 ---> Running in 0d18c0d9c386
WARNING: You have 2 updates available. Consider updating your CLI installation with 'az upgrade'
azure-cli                         2.29.0 *

core                              2.29.0 *
telemetry                          1.0.6

Python location '/usr/bin/python3.7'
Extensions directory '/root/.azure/cliextensions'

Python (Linux) 3.7.10 (default, Sep 28 2021, 20:29:11)
[GCC 9.1.0]

Legal docs and information: aka.ms/AzureCliLegal



Please let us know how we are doing: https://aka.ms/azureclihats
and let us know if you're interested in trying out our newest features: https://aka.ms/CLIUXstudy
Removing intermediate container 0d18c0d9c386
 ---> 5b549ca69286
Successfully built 5b549ca69286
Successfully tagged azure/azure-cli:mariner-builder

History Notes

NA

This checklist is used to make sure that common guidelines for a pull request are followed.

The PR title and description has followed the guideline in Submitting Pull Requests.
I adhere to the Command Guidelines.
I adhere to the Error Handling Guidelines.

Modify the `azure-cli.spec` with a %if conditional macro to handle mariner specific installation path. Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

jiasli · 2021-10-27T09:52:49Z

scripts/release/rpm/azure-cli.spec

 python_cmd=%{python_cmd}
 if command -v ${python_version} &>/dev/null; then python_cmd=${python_version}; fi
+%if 0%{?cblmariner}
+AZ_INSTALLER=RPM PYTHONPATH=\"%{_libdir}/az/lib/${python_version}/site-packages\" \$python_cmd -sm azure.cli \"\$@\"


There seems to be no difference between %{_libdir} and "$bin_dir"/../%{_lib}:

# command -v az /usr/bin/az # cat /usr/bin/az #!/usr/bin/env bash bin_dir=`cd "$(dirname "$BASH_SOURCE[0]")"; pwd` python_cmd=python3 if command -v python3.6 &>/dev/null; then python_cmd=python3.6; fi AZ_INSTALLER=RPM PYTHONPATH="$bin_dir"/../lib64/az/lib/python3.6/site-packages $python_cmd -sm azure.cli "$@" # rpm --eval %{_lib} lib64 # rpm --eval %{_libdir} /usr/lib64

The if-else seems redundant.

See https://rpm-packaging-guide.github.io/#rpm-macros

I tried that earlier, but that seemed to fail to find module specification (below):

root [ / ]# ls /usr/bin/az /usr/bin/az root [ / ]# cat /usr/bin/az #!/usr/bin/env bash bin_dir=`cd "$(dirname "$BASH_SOURCE[0]")"; pwd` python_cmd=python3 if command -v python3.7 &>/dev/null; then python_cmd=python3.7; fi AZ_INSTALLER=RPM PYTHONPATH="$bin_dir"/..//usr/lib/az/lib/python3.7/site-packages $python_cmd -sm azure.cli "$@" root [ / ]# az /usr/bin/python3.7: Error while finding module specification for 'azure.cli' (ModuleNotFoundError: No module named 'azure') root [ / ]#

It looks like %{_lib} doesn't expand correctly. Is this a bug on the image?

The macro %{_lib} & %{_libdir} both point to /usr/lib.
When we do the "$bin_dir"/../%{_lib}/az/lib/......... it points to a location which is not present, i.e
/usr/usr/lib/az/lib,

Mariner's %{_bindir} is /usr/bin and not /bin. This is the reason to have an %if else clause in the spec.

I will do some research in next sprint. We may possibly find one line that works everywhere.

I think %{_lib} is used here for a reason. Without it being available, we can't figure out the PYTHONPATH if the RPM is installed to some other place. See #17491 (comment)

Let's move the entry script work to #20574.

Do you want me to rebase this PR with the one you created or should I modify this PR with the change:

s/%{_lib}/lib64/

Please just don't change this file.

@jiasli As discussed offline, copying the az-cli.spec changes from PR #20574.

yonzhan · 2021-10-27T11:51:56Z

Support Mariner

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

mfrw · 2021-11-17T09:00:39Z

@yonzhan, @kairu-ms, @jiasli -- Team, a gentle reminder on this.
Do we have an update for this PR.

scripts/release/rpm/Dockerfile.mariner

Co-authored-by: Jiashuo Li <4003950+jiasli@users.noreply.github.com>

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

jiasli · 2021-12-02T07:50:28Z

scripts/release/rpm/Dockerfile.mariner

+
+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


For CentOS, it is /root/rpmbuild/RPMS/x86_64/azure-cli-${cli_version}-1.*.x86_64.rpm. Interesting difference.

mfrw added 3 commits October 27, 2021 11:01

[Packaging] Add Dockerfile for mariner

a3d82c1

Modify the `azure-cli.spec` with a %if conditional macro to handle mariner specific installation path. Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

[Packaging] Update Readme to reflect mariner build steps

36e1443

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

[Packaging] Fix test for fedora Dockerfile

0202484

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

mfrw requested review from jiasli and kairu-ms as code owners October 27, 2021 05:38

[Packaging] Use tdnf instead of yum for Dockerfile.mariner

7a77d89

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

jiasli reviewed Oct 27, 2021

View reviewed changes

yonzhan assigned jiasli Oct 27, 2021

yonzhan added this to the Nov 2021 (2021-12-07) milestone Oct 27, 2021

yonzhan self-requested a review October 27, 2021 13:39

mfrw requested a review from jiasli October 28, 2021 06:05

yonzhan approved these changes Oct 28, 2021

View reviewed changes

[Packaging] Add a script to build/extract CBL-Mariner rpm

9a5ca41

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

jiasli reviewed Dec 1, 2021

View reviewed changes

scripts/release/rpm/Dockerfile.mariner Outdated Show resolved Hide resolved

jiasli mentioned this pull request Dec 1, 2021

{Packaging} Adapt entry script to Mariner: hardcode %{_lib} to lib64 #20574

Merged

Update azure-cli.spec

f9f7aaf

jiasli requested a review from wangzelin007 as a code owner December 1, 2021 09:43

mfrw and others added 4 commits December 1, 2021 19:28

[Packaging] Use version 1.0 instead of 1.0.20210928

80e5215

Co-authored-by: Jiashuo Li <4003950+jiasli@users.noreply.github.com>

[Packaging] Remove un-necessary define

7417504

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

[Packaging] Adapt entry script to Mariner

5f03698

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

[Packaging] Drop dist tag from Dockerfile.mariner

d783e7d

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

mfrw mentioned this pull request Dec 2, 2021

[Packaging] Add CI job to build Mariner RPM #20584

Merged

3 tasks

jiasli mentioned this pull request Dec 2, 2021

{Packaging} Do not add post to version for release* branches #20585

Closed

Merge remote-tracking branch 'azure/dev' into mfrw/build-mariner

257a6d7

jiasli reviewed Dec 2, 2021

View reviewed changes

jiasli approved these changes Dec 2, 2021

View reviewed changes

jiasli merged commit 23a4a35 into Azure:dev Dec 2, 2021

mfrw deleted the mfrw/build-mariner branch December 2, 2021 07:55

jiasli added the Packaging/RPM label Dec 3, 2021

Conversation

mfrw commented Oct 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mfrw Dec 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yonzhan commented Oct 27, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mfrw commented Nov 17, 2021

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mfrw commented Oct 27, 2021 •

edited

Loading

mfrw Dec 1, 2021 •

edited

Loading

yonzhan commented Oct 27, 2021 •

edited

Loading