WIP: Feature/environment preconfiguration

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
     branches:
       - master
       - develop
+      - feature/environmentPreconfiguration
     tags:
       - 'v*.*.*'
   pull_request:
@@ -93,6 +94,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
+          target: ${{matrix.project}}
           platforms: linux/amd64,linux/arm64
           build-args: |
             PROJECT=${{matrix.project_context}}

Dockerfile

@@ -7,7 +7,7 @@ ADD target/connector.war /connector/connector.war
 RUN mkdir -p /connector/extracted && \
        unzip /connector/connector.war -d /connector/extracted/
 
-FROM tomcat:9-jre8-temurin
+FROM tomcat:9-jre8-temurin as docker-build
 
 ## Define for which project this image is build
 ARG PROJECT=samply
@@ -43,3 +43,66 @@ ENV JAVA_OPTS "-Dlog4j.configurationFile=${CATALINA_HOME}/conf/log4j2.xml"
 ADD src/docker/start.sh                         /docker/
 RUN chmod +x                                    /docker/start.sh
 CMD ["sh", "-c", "/docker/start.sh"]
+
+ENV TZ="Europe/Berlin"
+
+# Stage used by ci for dktk images (--target=dktk)
+FROM docker-build as dktk
+ENV TEST_PROJECT="dktk"
+ENV POSTGRES_PORT="5432"
+ENV CCP_CENTRALSEARCH_URL="https://centralsearch-test.dktk.dkfz.de/"
+ENV CCP_DECENTRALSEARCH_URL="https://decentralsearch-test.ccp-it.dktk.dkfz.de/"
+ENV CONNECTOR_ENABLE_METRICS="false"
+ENV POSTGRES_DB="share_v2"
+ENV POSTGRES_USER="samplyweb"
+ENV PROTOCOL="http"
+ENV PORT="8080"
+ENV DEPLOYMENT_CONTEXT="dktk-connector"
+ENV feature_BBMRI_DIRECTORY_SYNC="false"
+ENV feature_DKTK_CENTRAL_SEARCH="false"
+ENV feature_NNGM_CTS="false"
+ENV LOG_LEVEL="info"
+ENV MDR_URL="https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr"
+ENV POSTGRES_HOST="bridgehead_dktk_connector_db"
+ENV QUERY_LANGUAGE="QUERY"
+ENV PATIENTLIST_URL="http://bridgehead_patientlist:8080/Patientlist"
+ENV ID_MANAGER_URL="http://bridgehead_id-manager:8080"
+
+
+# Stage used by ci for gbn images (--target=gbn)
+FROM docker-build as gbn
+ENV TEST_PROJECT="gbn"
+ENV CONNECTOR_ENABLE_METRICS="false"
+ENV POSTGRES_DB="samply.connector"
+ENV POSTGRES_HOST="bridgehead_gbn_connector_db"
+ENV POSTGRES_USER="samply"
+ENV QUERY_LANGUAGE="CQL"
+ENV DEPLOYMENT_CONTEXT="gbn-connector"
+ENV LOG_LEVEL="info"
+ENV STORE_URL="http://bridgehead_gbn_blaze_store:8080"
+ENV MDR_URL="https://mdr.germanbiobanknode.de/v3/api/mdr"
+ENV PROTOCOL="http"
+ENV PORT="8080"
+
+# Stage used by ci for c4 images (--target=c4)
+FROM docker-build as c4
+ENV TEST_PROJECT="c4"
+ENV POSTGRES_PORT="5432"
+ENV CCP_CENTRALSEARCH_URL="https://centralsearch-test.dktk.dkfz.de/"
+ENV CCP_DECENTRALSEARCH_URL="https://decentralsearch-test.ccp-it.dktk.dkfz.de/"
+ENV CONNECTOR_ENABLE_METRICS="false"
+ENV POSTGRES_DB="share_v2"
+ENV POSTGRES_USER="samplyweb"
+ENV CONNECTOR_SHARE_URL="${PROTOCOL}://${HOST}:${PORT}"
+ENV DEPLOYMENT_CONTEXT="dktk-connector"
+ENV feature_BBMRI_DIRECTORY_SYNC="false"
+ENV feature_DKTK_CENTRAL_SEARCH="false"
+ENV feature_NNGM_CTS="false"
+ENV LOG_LEVEL="info"
+ENV MDR_URL="https://mdr.ccp-it.dktk.dkfz.de/v3/api/mdr"
+ENV POSTGRES_HOST="bridgehead_dktk_connector_db"
+ENV PROTOCOL="http"
+ENV QUERY_LANGUAGE="QUERY"
+
+# This stage is build when defining no target
+FROM docker-build as vanilla

src/docker/start.sh

@@ -13,6 +13,8 @@ if [ -n "$HTTP_PROXY" ]; then
 	HTTPS_PROXY_PASSWORD=$PROXY_PASS;
 fi
 
+export CONNECTOR_SHARE_URL="${PROTOCOL}://${HOST}:${PORT}"
+
 file=${CATALINA_HOME}/conf/Catalina/localhost/ROOT.xml
 if [ -n "$DEPLOYMENT_CONTEXT" ]; then
   echo "INFO: preparing deployment in context ${DEPLOYMENT_CONTEXT}"
@@ -25,7 +27,7 @@ sed -i "s/{postgres-host}/${POSTGRES_HOST}/"              "$file"
 sed -i "s/{postgres-port}/${POSTGRES_PORT:-5432}/"        "$file"
 sed -i "s/{postgres-db}/${POSTGRES_DB}/"                  "$file"
 sed -i "s/{postgres-user}/${POSTGRES_USER}/"              "$file"
-sed -i "s/{postgres-pass}/${POSTGRES_PASS}/"              "$file"
+sed -i "s/{postgres-pass}/${POSTGRES_PASSWORD}/"              "$file"
 
 file=${CATALINA_HOME}/conf/${PROJECT}_common_config.xml
 sed -i "s|{http-proxy-url}|${HTTP_PROXY_URL:-}|"              "$file"