make postgres start optional for Docker container (#2323)

GMOD · Nov 18, 2019 · 1f90932 · 1f90932
1 parent 7acd535
commit 1f90932
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/docker-files/createenv.sh b/docker-files/createenv.sh
@@ -14,6 +14,9 @@ echo "export WEBAPOLLO_DB_NAME=${WEBAPOLLO_DB_NAME}" >> $SET_ENV_FILE
 echo "export WEBAPOLLO_DB_USERNAME=${WEBAPOLLO_DB_USERNAME}" >> $SET_ENV_FILE
 echo "export WEBAPOLLO_DB_PASSWORD=${WEBAPOLLO_DB_PASSWORD}" >> $SET_ENV_FILE
 
+# Indicates if we want to start our own postgres server
+echo "export WEBAPOLLO_START_POSTGRES=${WEBAPOLLO_START_POSTGRES}" >> $SET_ENV_FILE
+
 # Indicates if we use Chado.  Default 'true'.
 echo "export WEBAPOLLO_USE_CHADO=${WEBAPOLLO_USE_CHADO}" >> $SET_ENV_FILE
 

diff --git a/docker-files/launch.sh b/docker-files/launch.sh
@@ -23,7 +23,11 @@ if [ ! -e "${WEBAPOLLO_DB_DATA}/PG_VERSION" ];then
 	su -c "/usr/lib/postgresql/9.6/bin/initdb -D ${WEBAPOLLO_DB_DATA}" postgres
 fi
 
-service postgresql start
+export WEBAPOLLO_START_POSTGRES="${WEBAPOLLO_START_POSTGRES:true}"
+
+if [[ "${WEBAPOLLO_START_POSTGRES}" == "true" ]]; then
+    service postgresql start
+fi
 
 export WEBAPOLLO_DB_HOST="${WEBAPOLLO_DB_HOST:-127.0.0.1}"
 export WEBAPOLLO_DB_NAME="${WEBAPOLLO_DB_NAME:-apollo}"