From a80f13aec29faca25e3745a30481875872c108c1 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Mon, 11 May 2026 16:38:21 +0530 Subject: [PATCH 1/7] [MASCORE-13709] - idm db new digest image and optional db name --- image/cli/Dockerfile | 3 +-- .../appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/image/cli/Dockerfile b/image/cli/Dockerfile index 2cae56b63d9..104a00412f9 100644 --- a/image/cli/Dockerfile +++ b/image/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/ibmmas/cli-base:latest +FROM quay.io/ibmmas/cli-base:1.10.1-pre.ibm-db ARG VERSION_LABEL # Auto-expire the image in quay.io after 3 weeks @@ -8,7 +8,6 @@ LABEL quay.expires-after=3w COPY app-root/src/ /opt/app-root/src/ COPY rbac/ /opt/app-root/src/rbac/ COPY mascli/ /mascli/ -COPY masfvt/ /masfvt/ COPY usr/bin/ /usr/bin/ # 2. Set up Environment diff --git a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 index 3a5eb96a655..d89263af56d 100644 --- a/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 +++ b/image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-iac-rdsdb2.tf.j2 @@ -35,7 +35,6 @@ module "db2rds-{{RDS_APP}}" { db2_enabled_cloudwatch_logs_exports = ["diag.log", "notify.log"] db2_additional_security_groups = local.cluster.security_groups region_name = "{{REGION_NAME}}" - db_name = "BLUDB" db2_identifier = "rds" engine_version = var.engine_version multi_az = false From d24c3a008f01a7093b98c11c800c4b0f8a318487 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Mon, 11 May 2026 17:34:26 +0530 Subject: [PATCH 2/7] [MASCORE-13709] - idm db new digest image and optional db name --- image/cli/install/permissions-updates.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/image/cli/install/permissions-updates.sh b/image/cli/install/permissions-updates.sh index f75b7677873..fd0714d9c91 100644 --- a/image/cli/install/permissions-updates.sh +++ b/image/cli/install/permissions-updates.sh @@ -11,7 +11,10 @@ chmod +x /mascli/mas chmod +x /mascli/must-gather/* chmod +x /mascli/debug/* chmod +x /mascli/backup-restore/* -chmod -R ug+w /masfvt +# Only chmod /masfvt if it exists +if [ -d /masfvt ]; then + chmod -R ug+w /masfvt +fi chmod +x /usr/bin/gather chmod -R g+w $ANSIBLE_COLLECTIONS_PATH/ibm/mas_devops ln -s $ANSIBLE_COLLECTIONS_PATH/ibm/mas_devops /mascli/ansible-devops From 6dfa1bd9364e4ec2174ee65fddaebe40554d2ab2 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 12 May 2026 15:50:41 +0530 Subject: [PATCH 3/7] [MASCORE-13709] - idm db new digest image and optional db name --- image/cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/cli/Dockerfile b/image/cli/Dockerfile index 104a00412f9..d665cbd49ea 100644 --- a/image/cli/Dockerfile +++ b/image/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/ibmmas/cli-base:1.10.1-pre.ibm-db +FROM quay.io/ibmmas/cli-base:1.11.0-pre.stable ARG VERSION_LABEL # Auto-expire the image in quay.io after 3 weeks From b569502957b6651f71565f68b6d593f579a82ec6 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 12 May 2026 15:56:18 +0530 Subject: [PATCH 4/7] [MASCORE-13709] - idm db new digest image and optional db name --- image/cli/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/image/cli/Dockerfile b/image/cli/Dockerfile index d665cbd49ea..90c8346e8f9 100644 --- a/image/cli/Dockerfile +++ b/image/cli/Dockerfile @@ -8,6 +8,7 @@ LABEL quay.expires-after=3w COPY app-root/src/ /opt/app-root/src/ COPY rbac/ /opt/app-root/src/rbac/ COPY mascli/ /mascli/ +COPY masfvt/ /masfvt/ COPY usr/bin/ /usr/bin/ # 2. Set up Environment From 72e0c412386bbd1381697065593c96ef4e0e76bf Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 12 May 2026 15:56:51 +0530 Subject: [PATCH 5/7] [MASCORE-13709] - idm db new digest image and optional db name --- image/cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/cli/Dockerfile b/image/cli/Dockerfile index 90c8346e8f9..2cae56b63d9 100644 --- a/image/cli/Dockerfile +++ b/image/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM quay.io/ibmmas/cli-base:1.11.0-pre.stable +FROM quay.io/ibmmas/cli-base:latest ARG VERSION_LABEL # Auto-expire the image in quay.io after 3 weeks From 077b44595de55cb7c5f6e188a985c99bf9d44493 Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 12 May 2026 17:19:36 +0530 Subject: [PATCH 6/7] [MASCORE-13709] - idm db new digest image and optional db name --- image/cli/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/image/cli/Dockerfile b/image/cli/Dockerfile index 2cae56b63d9..5ff911f7fb0 100644 --- a/image/cli/Dockerfile +++ b/image/cli/Dockerfile @@ -43,3 +43,4 @@ RUN --mount=type=secret,id=ARTIFACTORY_TOKEN \ ibmcloud config --check-version=false && \ ln -s /opt/app-root/lib/python3.12/site-packages /mascli/site-packages && \ rm -rf /tmp/install + From c607a213f60ef00ddbbc617f96a082f51011d0bb Mon Sep 17 00:00:00 2001 From: amitpandey Date: Tue, 12 May 2026 17:22:04 +0530 Subject: [PATCH 7/7] [MASCORE-13709] - idm db new digest image and optional db name --- image/cli/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/image/cli/Dockerfile b/image/cli/Dockerfile index 5ff911f7fb0..2cae56b63d9 100644 --- a/image/cli/Dockerfile +++ b/image/cli/Dockerfile @@ -43,4 +43,3 @@ RUN --mount=type=secret,id=ARTIFACTORY_TOKEN \ ibmcloud config --check-version=false && \ ln -s /opt/app-root/lib/python3.12/site-packages /mascli/site-packages && \ rm -rf /tmp/install -