bump 4.5.0-rc2 version.Fix shell issues.

docker · May 19, 2025 · 1fcdb3c · 1fcdb3c
1 parent 33e0429
commit 1fcdb3c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
 # COMANAGE #
+FROM i2incommon/comanage-base:rocky9.5-php8.2.28-shib3.4.1-1-1
 
 ARG COMANAGE_REGISTRY_VERSION
 ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION:-develop}
@@ -12,8 +13,6 @@ LABEL comanage_registry_src_url=${COMANAGE_REGISTRY_SRC_URL}
 ARG COMANAGE_REGISTRY_DIR
 ENV COMANAGE_REGISTRY_DIR ${COMANAGE_REGISTRY_DIR:-/srv/comanage-registry}
 
-FROM i2incommon/comanage-base:rocky9.5-php8.2.28-shib3.4.1-1-1
-
 RUN yum -y update && yum -y install \
         busybox \
         && yum clean -y all

diff --git a/slashRoot/usr/local/lib/comanage_utils.sh b/slashRoot/usr/local/lib/comanage_utils.sh
@@ -531,7 +531,7 @@ EOF
         php_string+="'sslmode' => '${COMANAGE_REGISTRY_DATABASE_POSTGRES_SSLMODE}',"
     fi
 
-    if [[ "${COMANAGE_REGISTRY_DATASOURCE}" == "Database/Mysql" ]]
+    if [[ "${COMANAGE_REGISTRY_DATASOURCE}" == "Database/Mysql" ]]; then
         if [[ -n "${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_KEY}" ]]; then
             php_string+=$'\n    '
             php_string+="'ssl_key' => '${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_KEY}',"