From 53686b67ba70c283e9ff9d6fea7616db7e61de4b Mon Sep 17 00:00:00 2001 From: Fabien Dupont Date: Wed, 18 Oct 2017 10:16:03 +0200 Subject: [PATCH] Added an option to skip the database setup --- content/opt/run | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/content/opt/run b/content/opt/run index 96037d3..6855568 100644 --- a/content/opt/run +++ b/content/opt/run @@ -65,6 +65,7 @@ if [ ! -f "${initfile}" ]; then RUNDECK_STORAGE_PROVIDER=${RUNDECK_STORAGE_PROVIDER:-"file"} RUNDECK_PROJECT_STORAGE_TYPE=${RUNDECK_PROJECT_STORAGE_TYPE:-"file"} NO_LOCAL_MYSQL=${NO_LOCAL_MYSQL:-"false"} + SKIP_DATABASE_SETUP=${SKIP_DATABASE_SETUP:-"false"} LOGIN_MODULE=${LOGIN_MODULE:-"RDpropertyfilelogin"} JAAS_CONF_FILE=${JAAS_CONF_FILE:-"jaas-loginmodule.conf"} KEYSTORE_PASS=${KEYSTORE_PASS:-"adminadmin"} @@ -125,7 +126,7 @@ if [ ! -f "${initfile}" ]; then cat /opt/mysql.conf >> /etc/supervisor/conf.d/rundeck.conf else echo "=>NO_LOCAL_MYSQL set to true. Skipping local MySQL setup" - if [[ ${DATABASE_URL} == *"mysql"* ]]; then + if [[ "${DATABASE_URL}" == *"mysql"* && "${SKIP_DATABASE_SETUP}" != "true" ]]; then echo "=>Initializing remote MySQL setup" ( echo "CREATE DATABASE IF NOT EXISTS rundeckdb;" @@ -134,7 +135,7 @@ if [ ! -f "${initfile}" ]; then ) | mysql --host=$(echo ${DATABASE_URL} | grep -oP "(?<=jdbc:mysql:\/\/)(.*)(?=\/)") --user=${DATABASE_ADMIN_USER} --password=${DATABASE_ADMIN_PASSWORD} else - echo "=>Remote database is not MySQL. Skipping remote setup" + echo "=>Skipping remote database setup" fi fi