Skip to content

Commit b8bc858

Browse files
rikenm1PawelWMS
andauthored
[3.0] Use Toolchain RPMS when building Golden Container (#10474)
Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
1 parent e728ae0 commit b8bc858

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

.pipelines/containerSourceData/scripts/BuildGoldenContainer.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ set -e
5858
# -j OUTPUT -k ./rpms.tar.gz -l ~/azurelinux/.pipelines/containerSourceData \
5959
# -m "false" -n "false" -p development -q "false" -u "true"
6060

61-
while getopts ":a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:" OPTIONS; do
61+
while getopts ":a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:w:" OPTIONS; do
6262
case ${OPTIONS} in
6363
a ) BASE_IMAGE_NAME_FULL=$OPTARG;;
6464
b ) ACR=$OPTARG;;
@@ -82,6 +82,7 @@ while getopts ":a:b:c:d:e:f:g:h:i:j:k:l:m:n:o:p:q:r:s:t:u:v:" OPTIONS; do
8282
t ) SBOM_SCRIPT=$OPTARG;;
8383
u ) DISTROLESS=$OPTARG;;
8484
v ) VERSION_EXTRACT_CMD=$OPTARG;;
85+
w ) TOOLCHAIN_RPMS_TARBALL=$OPTARG;;
8586

8687
\? )
8788
echo "Error - Invalid Option: -$OPTARG" 1>&2
@@ -125,6 +126,7 @@ function print_inputs {
125126
echo "SBOM_TOOL_PATH -> $SBOM_TOOL_PATH"
126127
echo "SBOM_SCRIPT -> $SBOM_SCRIPT"
127128
echo "DISTROLESS -> $DISTROLESS"
129+
echo "TOOLCHAIN_RPMS_TARBALL -> $TOOLCHAIN_RPMS_TARBALL"
128130
}
129131

130132
function validate_inputs {
@@ -168,6 +170,11 @@ function validate_inputs {
168170
exit 1
169171
fi
170172

173+
if [[ ! -f $TOOLCHAIN_RPMS_TARBALL ]]; then
174+
echo "Error - No TOOLCHAIN_RPMS tarball found under '$TOOLCHAIN_RPMS_TARBALL'."
175+
exit 1
176+
fi
177+
171178
if [ ! -d "$CONTAINER_SRC_DIR" ]; then
172179
echo "Error - Container source directory does not exist."
173180
exit 1
@@ -236,7 +243,9 @@ function prepare_docker_directory {
236243
mkdir -pv "$HOST_MOUNTED_DIR"
237244

238245
# Copy files into docker context directory
239-
tar -xf "$RPMS_TARBALL" -C "$HOST_MOUNTED_DIR"/
246+
tar -xvf "$RPMS_TARBALL" -C "$HOST_MOUNTED_DIR"/
247+
# we look for the toolchain rpms in the same directory as the rpms tarball
248+
tar -xvf "$TOOLCHAIN_RPMS_TARBALL" -C "$HOST_MOUNTED_DIR/RPMS"/
240249
cp -v "$CONTAINER_SRC_DIR/azurelinuxlocal.repo" "$HOST_MOUNTED_DIR"/
241250
}
242251

0 commit comments

Comments
 (0)