trim down fossology_init.sh

Author: Dan Butvinik

fossology_init.sh

@@ -1,80 +1,16 @@
 #!/bin/bash
-# FOSSology docker-entrypoint script
-# modified for ClearlyDefined
-# Copyright Siemens AG 2016, [email protected]
-# Copyright TNG Technology Consulting GmbH 2016, [email protected]
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.  This file is offered as-is,
-# without any warranty.
-#
-# Description: startup helper script for the FOSSology Docker container
 
-set -o errexit -o nounset -o pipefail
+./docker-entrypoint.sh &
 
-db_host="${FOSSOLOGY_DB_HOST:-localhost}"
-db_name="${FOSSOLOGY_DB_NAME:-fossology}"
-db_user="${FOSSOLOGY_DB_USER:-fossy}"
-db_password="${FOSSOLOGY_DB_PASSWORD:-fossy}"
+RETRIES=5
 
-# Write configuration
-cat <<EOM > /usr/local/etc/fossology/Db.conf
-dbname=$db_name;
-host=$db_host;
-user=$db_user;
-password=$db_password;
-EOM
-
-sed -i 's/address = .*/address = '"${FOSSOLOGY_SCHEDULER_HOST:-localhost}"'/' \
-    /usr/local/etc/fossology/fossology.conf
-
-# Startup DB if needed or wait for external DB
-if [[ $db_host == 'localhost' ]]; then
-  echo '*****************************************************'
-  echo 'WARNING: No database host was set and therefore the'
-  echo 'internal database without persistency will be used.'
-  echo 'THIS IS NOT RECOMENDED FOR PRODUCTIVE USE!'
-  echo '*****************************************************'
+until /etc/init.d/postgresql status | grep online > /dev/null 2>&1 || [ $RETRIES -eq 0 ]; do
+  echo "Waiting for postgres server, $((RETRIES--)) remaining attempts..."
   sleep 5
-  /etc/init.d/postgresql start
-else
-  test_for_postgres() {
-    PGPASSWORD=$db_password psql -h "$db_host" "$db_name" "$db_user" -c '\l' >/dev/null
-    return $?
-  }
-  until test_for_postgres; do
-    >&2 echo "Postgres is unavailable - sleeping"
-    sleep 1
-  done
-fi
-
-# Setup environment
-if [[ $# -eq 0 || ($# -eq 1 && "$1" == "scheduler") ]]; then
-  /usr/local/lib/fossology/fo-postinstall --database --licenseref
-fi
+done
 
-# Start Fossology
-echo
-echo 'Fossology initialisation complete; Starting up...'
-echo
-if [[ $# -eq 0 ]]; then
-  /etc/init.d/fossology start
-  /usr/local/share/fossology/scheduler/agent/fo_scheduler \
-    --log /dev/stdout \
-    --verbose=3 \
-    --reset &
-  /usr/sbin/apache2ctl -D BACKGROUND
+echo "postgres status online!"
+sleep 5
 
-  # Build the knowledgebase file so we can pick it up in the next stage of the build
-  /usr/local/share/fossology/monk/agent/monk -s /tmp/monk_knowledgebase
-elif [[ $# -eq 1 && "$1" == "scheduler" ]]; then
-  exec /usr/local/share/fossology/scheduler/agent/fo_scheduler \
-    --log /dev/stdout \
-    --verbose=3 \
-    --reset
-elif [[ $# -eq 1 && "$1" == "web" ]]; then
-  exec /usr/sbin/apache2ctl -e info -D FOREGROUND
-else
-  exec "$@"
-fi
+# Build the knowledgebase file so we can pick it up in the next stage of the build
+/usr/local/share/fossology/monk/agent/monk -s /tmp/monk_knowledgebase