diff --git a/Dockerfile b/Dockerfile index 396922a..a5e2a0c 100644 --- 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 index 5a67b21..2a20e52 100644 --- 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}" && \