change base image version. Fix mysql cert bash configuration.

docker · Jun 17, 2025 · aeedef3 · aeedef3
1 parent c9be0c2
commit aeedef3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # COMANAGE #
-FROM i2incommon/comanage-base:rocky9.5-php8.2.28-shib3.4.1-1-1
+FROM i2incommon/comanage-base:latest
 
 ARG COMANAGE_REGISTRY_VERSION
 ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION:-develop}

diff --git a/slashRoot/usr/local/lib/comanage_utils.sh b/slashRoot/usr/local/lib/comanage_utils.sh
@@ -531,23 +531,6 @@ EOF
         php_string+="'sslmode' => '${COMANAGE_REGISTRY_DATABASE_POSTGRES_SSLMODE}',"
     fi
 
-    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}',"
-        fi
-
-        if [[ -n "${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CERT}" ]]; then
-            php_string+=$'\n    '
-            php_string+="'ssl_cert' => '${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CERT}',"
-        fi
-
-        if [[ -n "${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CA}" ]]; then
-            php_string+=$'\n    '
-            php_string+="'ssl_ca' => '${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CA}',"
-        fi
-    fi
-
     ## MySql ssl configuration
     if [[ "${COMANAGE_REGISTRY_DATASOURCE}" == "Database/Mysql" && \
           -n "${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_KEY}" && \