Skip to content

Commit

Permalink
[patch] Add support for mirroring odf dependcies that are required fo…
Browse files Browse the repository at this point in the history
…r 4.15 (#1235)
  • Loading branch information
IanBoden authored Sep 12, 2024
1 parent 7ea23a9 commit 35ea966
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @durera @andrercm @sanjayprab @terenceq @whitfiea @alequint @leo-miran
* @durera @JonahLuckett @andrercm @sanjayprab @terenceq @whitfiea @alequint @leo-miran
12 changes: 11 additions & 1 deletion image/cli/mascli/functions/mirror_images
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ Content Selection (Other Dependencies):
--mirror-mongo-v7 Mirror images for MongoDb Community Edition version 7
--mirror-db2 Mirror images for IBM Db2
--mirror-appconnect Mirror images for IBM AppConnect
--mirror-odf Mirror images for ODF
Content Selection (All images included):
--mirror-everything Mirror all MAS related images (including dependencies)
Expand Down Expand Up @@ -102,6 +103,7 @@ function mirror_everything() {

MIRROR_DB2U=true
MIRROR_APPCONNECT=true
MIRROR_ODF=true

# Dependencies (CP4D)
MIRROR_CP4D=true
Expand Down Expand Up @@ -140,6 +142,7 @@ function mirror_to_registry_noninteractive() {
MIRROR_SPARK=false
MIRROR_COGNOS=false
MIRROR_APPCONNECT=false
MIRROR_ODF=false

while [[ $# -gt 0 ]]
do
Expand Down Expand Up @@ -257,6 +260,9 @@ function mirror_to_registry_noninteractive() {
--mirror-appconnect)
MIRROR_APPCONNECT=true
;;
--mirror-odf)
MIRROR_ODF=true
;;

# Content Selection (Cloud Pak for Data)
--mirror-cp4d)
Expand Down Expand Up @@ -430,6 +436,7 @@ function mirror_to_registry_interactive() {
prompt_for_confirm "IBM Cognos Analytics" MIRROR_COGNOS

prompt_for_confirm "IBM AppConnect" MIRROR_APPCONNECT
prompt_for_confirm "RedHat ODF" MIRROR_ODF
fi

if [[ "$MIRROR_MAS_ICD" == "true" ]]; then
Expand Down Expand Up @@ -520,6 +527,7 @@ function mirror_to_registry() {
export MIRROR_SPARK
export MIRROR_COGNOS
export MIRROR_APPCONNECT
export MIRROR_ODF
export MIRROR_MAS_ICD
export MIRROR_EVERYTHING

Expand All @@ -539,6 +547,7 @@ function mirror_to_registry() {
"$MIRROR_MONGOCE_V7" == true ||
"$MIRROR_DB2U" == true ||
"$MIRROR_APPCONNECT" == true ||
"$MIRROR_ODF" == true ||
"$MIRROR_CP4D" == true ||
"$MIRROR_WSL" == true ||
"$MIRROR_WML" == true ||
Expand Down Expand Up @@ -615,6 +624,7 @@ function mirror_to_registry() {
show_mirror_status "+ Version 7 ........................." $MIRROR_MONGOCE_V7
show_mirror_status "IBM Db2 ............................." $MIRROR_DB2U
show_mirror_status "IBM AppConnect ......................" $MIRROR_APPCONNECT
show_mirror_status "RedHat ODF .........................." $MIRROR_ODF

echo
reset_colors
Expand Down Expand Up @@ -642,4 +652,4 @@ function mirror_to_registry() {
mirror_one_thing $MIRROR_MAS_OPTIMIZER "IBM Maximo Optimizer" "$LOG_PREFIX-optimizer.log" mirror_add_optimizer
mirror_one_thing $MIRROR_MAS_VISUALINSPECTION "IBM Maximo Visual Inspection" "$LOG_PREFIX-visualinspection.log" mirror_add_visualinspection
mirror_one_thing $MIRROR_DEPS "Selected Dependencies" "$LOG_PREFIX-dependencies.log" mirror_dependencies
}
}

0 comments on commit 35ea966

Please sign in to comment.