diff --git a/Dockerfile b/Dockerfile index b081c95..70d7df7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ 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:latest +FROM i2incommon/comanage-base:rocky9.5-php8.2.28-shib3.4.1-1-1 RUN yum -y update && yum -y install \ busybox \ diff --git a/common.bash b/common.bash index 4ff9d3c..8002585 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="i2incommon" imagename="comanage-registry-cron-dev" -comanage_version="4.3.4" +comanage_version="4.5.0-rc2" diff --git a/jenkins/build.sh b/jenkins/build.sh index 5dba735..1cd88ab 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -29,5 +29,5 @@ else fi docker buildx inspect --bootstrap -docker buildx build --no-cache --platform linux/amd64 -t ${IMAGENAME}_${TAG} --build-arg COMANAGE_REGISTRY_VERSION=${comanage_version} --load . -docker buildx build --no-cache --platform linux/arm64 -t ${IMAGENAME}_${TAG}:arm64 --build-arg COMANAGE_REGISTRY_VERSION=${comanage_version} --load . \ No newline at end of file +docker buildx build --no-cache --platform linux/amd64 -t "${IMAGENAME}"_"${TAG}" --build-arg COMANAGE_REGISTRY_VERSION="${COMANAGE_REGISTRY_VERSION}" --load . +docker buildx build --no-cache --platform linux/arm64 -t "${IMAGENAME}"_"${TAG}":arm64 --build-arg COMANAGE_REGISTRY_VERSION="${COMANAGE_REGISTRY_VERSION}" --load . \ No newline at end of file diff --git a/secrets/.keep b/secrets/.keep new file mode 100644 index 0000000..e69de29 diff --git a/slashRoot/usr/local/lib/comanage_utils.sh b/slashRoot/usr/local/lib/comanage_utils.sh index 7faea04..e2ae1a1 100644 --- a/slashRoot/usr/local/lib/comanage_utils.sh +++ b/slashRoot/usr/local/lib/comanage_utils.sh @@ -126,29 +126,34 @@ function comanage_utils::consume_injected_environment() { local injectable_config_vars injectable_config_vars=( - COMANAGE_REGISTRY_ADMIN_GIVEN_NAME COMANAGE_REGISTRY_ADMIN_FAMILY_NAME + COMANAGE_REGISTRY_ADMIN_GIVEN_NAME COMANAGE_REGISTRY_ADMIN_USERNAME - COMANAGE_REGISTRY_CRON_USER COMANAGE_REGISTRY_CRONTAB - COMANAGE_REGISTRY_DATASOURCE + COMANAGE_REGISTRY_CRON_USER COMANAGE_REGISTRY_DATABASE COMANAGE_REGISTRY_DATABASE_HOST + COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CA + COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CERT + COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_KEY COMANAGE_REGISTRY_DATABASE_PORT COMANAGE_REGISTRY_DATABASE_POSTGRES_SSLMODE COMANAGE_REGISTRY_DATABASE_USER COMANAGE_REGISTRY_DATABASE_USER_PASSWORD + COMANAGE_REGISTRY_DATASOURCE + COMANAGE_REGISTRY_EMAIL_ACCOUNT + COMANAGE_REGISTRY_EMAIL_ACCOUNT_PASSWORD COMANAGE_REGISTRY_EMAIL_FROM - COMANAGE_REGISTRY_EMAIL_TRANSPORT - COMANAGE_REGISTRY_EMAIL_TLS COMANAGE_REGISTRY_EMAIL_HOST COMANAGE_REGISTRY_EMAIL_PORT - COMANAGE_REGISTRY_EMAIL_ACCOUNT - COMANAGE_REGISTRY_EMAIL_ACCOUNT_PASSWORD - COMANAGE_REGISTRY_HTTP_LISTEN_PORT - COMANAGE_REGISTRY_HTTP_NO + COMANAGE_REGISTRY_EMAIL_TLS + COMANAGE_REGISTRY_EMAIL_TRANSPORT COMANAGE_REGISTRY_HTTPS_LISTEN_PORT COMANAGE_REGISTRY_HTTPS_NO + COMANAGE_REGISTRY_HTTP_LISTEN_PORT + COMANAGE_REGISTRY_HTTP_NO + COMANAGE_REGISTRY_NO_DATABASE_CONFIG + COMANAGE_REGISTRY_NO_EMAIL_CONFIG COMANAGE_REGISTRY_OIDC_AUTH_REQUEST_PARAMS COMANAGE_REGISTRY_OIDC_CLIENT_ID COMANAGE_REGISTRY_OIDC_CLIENT_SECRET @@ -159,8 +164,7 @@ function comanage_utils::consume_injected_environment() { COMANAGE_REGISTRY_OIDC_SCOPES COMANAGE_REGISTRY_OIDC_SESSION_INACTIVITY_TIMEOUT COMANAGE_REGISTRY_OIDC_SESSION_MAX_DURATION - COMANAGE_REGISTRY_NO_DATABASE_CONFIG - COMANAGE_REGISTRY_NO_EMAIL_CONFIG + COMANAGE_REGISTRY_PHP_SESSION_REDIS_URL COMANAGE_REGISTRY_REMOTE_IP COMANAGE_REGISTRY_REMOTE_IP_HEADER COMANAGE_REGISTRY_REMOTE_IP_INTERNAL_PROXY @@ -172,14 +176,13 @@ function comanage_utils::consume_injected_environment() { COMANAGE_REGISTRY_REMOTE_IP_TRUSTED_PROXY_LIST COMANAGE_REGISTRY_SECURITY_SALT COMANAGE_REGISTRY_SECURITY_SEED - COMANAGE_REGISTRY_PHP_SESSION_REDIS_URL COMANAGE_REGISTRY_SKIP_SETUP COMANAGE_REGISTRY_SKIP_UPGRADE COMANAGE_REGISTRY_SLASH_ROOT_DIRECTORY COMANAGE_REGISTRY_VIRTUAL_HOST_FQDN + COMANAGE_REGISTRY_VIRTUAL_HOST_PORT COMANAGE_REGISTRY_VIRTUAL_HOST_REDIRECT_HTTP_NO COMANAGE_REGISTRY_VIRTUAL_HOST_SCHEME - COMANAGE_REGISTRY_VIRTUAL_HOST_PORT HTTPS_CERT_FILE HTTPS_PRIVKEY_FILE SERVER_NAME @@ -244,6 +247,22 @@ function comanage_utils::deploy_crontab() { fi } +########################################## +# Enable CAKEPHP debug mode +# Globals: +# COMANAGE_DEBUG +# Arguments: +# None +# Returns: +# None +########################################## +function comanage_utils::enable_debug_mode() { + if [ -n "$COMANAGE_DEBUG" ] && [ "$COMANAGE_DEBUG" == 2 ]; then + comanage_utils::configure_cache_disable + comanage_utils::configure_cakephp_debug + fi +} + ########################################## # Enable the Apache HTTP Server virtual host # Globals: @@ -451,6 +470,9 @@ function comanage_utils::manage_tier_environment() { # COMANAGE_REGISTRY_DATABASE_USER_PASSWORD # COMANAGE_REGISTRY_DATASOURCE # COMANAGE_REGISTRY_DIR +# COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_KEY +# COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CERT +# COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CA # OUTPUT # Arguments: # None @@ -509,6 +531,40 @@ EOF php_string+="'sslmode' => '${COMANAGE_REGISTRY_DATABASE_POSTGRES_SSLMODE}'," fi + if [[ "${COMANAGE_REGISTRY_DATASOURCE}" == "Database/Mysql" ]] + 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}" && \ + -n "${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CERT}" && \ + -n "${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CA}" ]]; then + + php_string+=$'\n ' + php_string+="'ssl_key' => '${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_KEY}'," + + php_string+=$'\n ' + php_string+="'ssl_cert' => '${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CERT}'," + + php_string+=$'\n ' + php_string+="'ssl_ca' => '${COMANAGE_REGISTRY_DATABASE_MYSQL_SSL_CA}'," + fi + + php_string+=$'\n );\n}\n'; printf "%s" "$php_string" > $database_config @@ -1115,9 +1171,7 @@ function comanage_utils::registry_upgrade() { # None ########################################## function comanage_utils::start_syslogd() { - - /sbin/syslogd -O /proc/1/fd/1 -S - + /sbin/busybox syslogd -O /proc/1/fd/1 -S } ##########################################