diff --git a/Dockerfile b/Dockerfile index d4b4d7d4..d04f3cc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -172,7 +172,7 @@ USER www-data WORKDIR ${BUILD_DIR} # Check if APP_KEY is set and valid -RUN if [ -z "$APP_KEY" || ! "$APP_KEY" =~ ^base64:[A-Za-z0-9+/=]{43}$ ]; then \ +RUN if [ -z "$APP_KEY" ] || ! echo "$APP_KEY" | grep -Eq '^base64:[A-Za-z0-9+/=]{43}$'; then \: echo "APP_KEY is not set or invalid. Generating a new APP_KEY..."; \ php artisan key:generate --ansi; \ else \ diff --git a/openshift/scripts/deploy-env-configmap.sh b/openshift/scripts/deploy-env-configmap.sh index eb0f2b89..4f5d1d47 100644 --- a/openshift/scripts/deploy-env-configmap.sh +++ b/openshift/scripts/deploy-env-configmap.sh @@ -6,6 +6,7 @@ envsubst < ./example.env > $TEMP_ENV_FILE if [[ `oc describe configmap $APP_NAME-env 2>&1` =~ "NotFound" ]]; then # Nothing to delete + echo "ConfigMap does not exist..." else echo "ConfigMap exists... Deleting: $APP_NAME-env" oc delete configmap $APP_NAME-env