From fca2d717437b290f300637b1e1ad291fe0c5f492 Mon Sep 17 00:00:00 2001 From: Franck Martin Date: Mon, 27 Mar 2023 20:23:46 -0700 Subject: [PATCH 1/2] Update prepare_environment.md Adding the required dependencies for setting the tools if you are setting this environment on CBL-Mariner instead of Ubuntu --- docs/getting_started/prepare_environment.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/docs/getting_started/prepare_environment.md b/docs/getting_started/prepare_environment.md index 41c6a48..2d32207 100644 --- a/docs/getting_started/prepare_environment.md +++ b/docs/getting_started/prepare_environment.md @@ -32,6 +32,26 @@ sudo usermod -aG docker $USER **You will need to log out and lock back in** for user changes to take effect. +You can also setup this environment on CBL-Mariner +```bash +# Install required dependencies. +sudo dnf -y install git make tar wget curl rpm golang genisoimage python bison gawk glibc-devel binutils kernel-headers +``` +You may want to install rpmlint, in this case you need to add the extended repo in /etc/yum.repos.d/ as mariner-extended.repo +```bash +[mariner-official-extended] +name=CBL-Mariner Official Extended $releasever $basearch +baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/extended/$basearch +gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY +gpgcheck=1 +repo_gpgcheck=1 +enabled=1 +skip_if_unavailable=True +sslverify=1 +``` + +At the moment docker does not support Mariner. + ## Clone CBL-Mariner and Build the Toolkit To build the CBL-MarinerTutorials repository you will need the same toolkit and makefile from the CBL-Mariner repository. So, first clone CBL-Mariner, and then checkout the stable release of interest (e.g. 1.0-stable or 2.0-stable), then build the toolkit. From 5d61357e25b8482ae0c52f49d10ed6cf9082f362 Mon Sep 17 00:00:00 2001 From: Franck Martin Date: Wed, 5 Apr 2023 16:55:41 -0700 Subject: [PATCH 2/2] Update prepare_environment.md Changing the instructions to add the extended repo to install rpmlint --- docs/getting_started/prepare_environment.md | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/docs/getting_started/prepare_environment.md b/docs/getting_started/prepare_environment.md index 2d32207..5eab85d 100644 --- a/docs/getting_started/prepare_environment.md +++ b/docs/getting_started/prepare_environment.md @@ -37,17 +37,10 @@ You can also setup this environment on CBL-Mariner # Install required dependencies. sudo dnf -y install git make tar wget curl rpm golang genisoimage python bison gawk glibc-devel binutils kernel-headers ``` -You may want to install rpmlint, in this case you need to add the extended repo in /etc/yum.repos.d/ as mariner-extended.repo +You may want to install rpmlint, in this case you first need to add the extended repo ```bash -[mariner-official-extended] -name=CBL-Mariner Official Extended $releasever $basearch -baseurl=https://packages.microsoft.com/cbl-mariner/$releasever/prod/extended/$basearch -gpgkey=file:///etc/pki/rpm-gpg/MICROSOFT-RPM-GPG-KEY file:///etc/pki/rpm-gpg/MICROSOFT-METADATA-GPG-KEY -gpgcheck=1 -repo_gpgcheck=1 -enabled=1 -skip_if_unavailable=True -sslverify=1 +sudo tdnf -y install mariner-repos-extended +sudo dnf -y install rpmlint ``` At the moment docker does not support Mariner.