From 48bcef9b3b3a9b7f588bb9c121c573faf3bee72b Mon Sep 17 00:00:00 2001 From: Drupad Panchal Date: Wed, 23 Oct 2024 13:52:23 +0000 Subject: [PATCH 1/3] agent installer update for root dir change Signed-off-by: Drupad Panchal --- .../dockerfiles/latest/container-scripts/install_zip.sh | 4 ++-- .../dockerfiles/latest/container-scripts/watchdog.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh index 9be77c1f95..0ceb1ac5ff 100644 --- a/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh +++ b/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh @@ -54,7 +54,7 @@ function install_agent() { export SYSTEM_MANAGER_OVERRIDE=true _unpack_install_bundle "$1" - execute_cmd "/bin/bash ${PACKAGES}/installer.sh $CONFIG_FILE" "install" + execute_cmd "/bin/bash ${INSTALL_BASEDIR}/installer.sh $CONFIG_FILE" "install" return $? } @@ -65,7 +65,7 @@ function upgrade_with_install_bundle() { export SYSTEM_MANAGER_OVERRIDE=true _unpack_install_bundle "$1" - execute_cmd "/bin/bash ${PACKAGES}/installer.sh -u" "upgrade" + execute_cmd "/bin/bash ${INSTALL_BASEDIR}/installer.sh -u" "upgrade" return $? } diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh index ad6b095ac4..a930a4d5bb 100755 --- a/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh +++ b/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh @@ -13,6 +13,7 @@ BASE_DIR=/opt/oracle BOOTSTRAP_HOME="$BASE_DIR/bootstrap" SCRIPTS=$BOOTSTRAP_HOME/scripts PACKAGES=$BOOTSTRAP_HOME/packages +INSTALL_BASEDIR=$PACKAGES/mgmt_agent # shellcheck disable=SC2034 UPGRADE_STAGE=$BOOTSTRAP_HOME/upgrade CONFIG_FILE="$BASE_DIR/mgmtagent_secret/input.rsp" From 238b19c2be0208dea068c8a376cf852ba0f5cbd3 Mon Sep 17 00:00:00 2001 From: Drupad Panchal Date: Wed, 23 Oct 2024 14:46:55 +0000 Subject: [PATCH 2/3] address lint issues --- .../dockerfiles/latest/container-scripts/watchdog.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh index a930a4d5bb..bd5d73627f 100755 --- a/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh +++ b/OracleManagementAgent/dockerfiles/latest/container-scripts/watchdog.sh @@ -13,6 +13,7 @@ BASE_DIR=/opt/oracle BOOTSTRAP_HOME="$BASE_DIR/bootstrap" SCRIPTS=$BOOTSTRAP_HOME/scripts PACKAGES=$BOOTSTRAP_HOME/packages +# shellcheck disable=SC2034 INSTALL_BASEDIR=$PACKAGES/mgmt_agent # shellcheck disable=SC2034 UPGRADE_STAGE=$BOOTSTRAP_HOME/upgrade From 9d239f302543c64235c4c85673caa584b52c798a Mon Sep 17 00:00:00 2001 From: Drupad Panchal Date: Wed, 23 Oct 2024 14:56:12 +0000 Subject: [PATCH 3/3] address lint issues Signed-off-by: Drupad Panchal --- .../dockerfiles/latest/container-scripts/common.sh | 0 .../dockerfiles/latest/container-scripts/initialize.sh | 0 .../dockerfiles/latest/container-scripts/install_zip.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 OracleManagementAgent/dockerfiles/latest/container-scripts/common.sh mode change 100644 => 100755 OracleManagementAgent/dockerfiles/latest/container-scripts/initialize.sh mode change 100644 => 100755 OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/common.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/common.sh old mode 100644 new mode 100755 diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/initialize.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/initialize.sh old mode 100644 new mode 100755 diff --git a/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh b/OracleManagementAgent/dockerfiles/latest/container-scripts/install_zip.sh old mode 100644 new mode 100755