Skip to content

Commit 9e01ea9

Browse files
authored
[2.0] Use Toolchain RPMS when building Golden Container (#10473)
1 parent 85a79af commit 9e01ea9

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

.pipelines/containerSourceData/scripts/BuildGoldenContainer.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ set -e
5757
# -j OUTPUT -k ./rpms.tar.gz -l ~/CBL-Mariner/.pipelines/containerSourceData \
5858
# -m "false" -n "false" -p development -q "false" -u "true"
5959

60-
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
60+
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
6161
case ${OPTIONS} in
6262
a ) BASE_IMAGE_NAME_FULL=$OPTARG;;
6363
b ) ACR=$OPTARG;;
@@ -81,6 +81,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
8181
t ) SBOM_SCRIPT=$OPTARG;;
8282
u ) DISTROLESS=$OPTARG;;
8383
v ) VERSION_EXTRACT_CMD=$OPTARG;;
84+
w ) TOOLCHAIN_RPMS_TARBALL=$OPTARG;;
8485

8586
\? )
8687
echo "Error - Invalid Option: -$OPTARG" 1>&2
@@ -124,6 +125,7 @@ function print_inputs {
124125
echo "SBOM_TOOL_PATH -> $SBOM_TOOL_PATH"
125126
echo "SBOM_SCRIPT -> $SBOM_SCRIPT"
126127
echo "DISTROLESS -> $DISTROLESS"
128+
echo "TOOLCHAIN_RPMS_TARBALL -> $TOOLCHAIN_RPMS_TARBALL"
127129
}
128130

129131
function validate_inputs {
@@ -167,6 +169,11 @@ function validate_inputs {
167169
exit 1
168170
fi
169171

172+
if [[ ! -f $TOOLCHAIN_RPMS_TARBALL ]]; then
173+
echo "Error - No TOOLCHAIN_RPMS_TARBALL tarball found."
174+
exit 1
175+
fi
176+
170177
if [ ! -d "$CONTAINER_SRC_DIR" ]; then
171178
echo "Error - Container source directory does not exist."
172179
exit 1
@@ -262,6 +269,7 @@ function prepare_docker_directory {
262269

263270
# Copy files into docker context directory
264271
tar -xf "$RPMS_TARBALL" -C "$HOST_MOUNTED_DIR"/
272+
tar -xf "$TOOLCHAIN_RPMS_TARBALL" -C "$HOST_MOUNTED_DIR/RPMS"/
265273
cp -v "$CONTAINER_SRC_DIR/marinerLocalRepo.repo" "$HOST_MOUNTED_DIR"/
266274
}
267275

0 commit comments

Comments
 (0)