Merge pull request #27 from thehyve/docker

Update entrypoint.sh, fix the docker image

docker/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     volumes:
       - db-data:/var/lib/postgresql/data
     networks:
-      - db-network
+      - gb-backend-db-network
   gb-backend:
     container_name: gb-backend
     image: thehyve/glowing-bear-backend
@@ -20,7 +20,7 @@ services:
       TRANSMART_API_SERVER_URL: ${TRANSMART_API_SERVER_URL}
       KEYCLOAK_SERVER_URL: ${KEYCLOAK_SERVER_URL}
       KEYCLOAK_REALM: ${KEYCLOAK_REALM}
-      KEYCLOAK_CLIENT_ID: transmart-client
+      KEYCLOAK_CLIENT_ID: ${KEYCLOAK_CLIENT_ID}
       DB_USER: gb
       DB_PASSWORD: gb
       DB_HOST: gb-backend-database
@@ -30,11 +30,10 @@ services:
       - gb-backend-database
 #      - transmart-api-server
     networks:
-      - db-network
-
+      - gb-backend-db-network
 volumes:
   db-data:
 
 networks:
-  db-network:
+  gb-backend-db-network:
     driver: bridge

docker/entrypoint.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 set -e
 
-cat > "${APP_CONFIG_DIR}" <<EndOfMessage
+cat > "${APP_CONFIG_FILE}" <<EndOfMessage
 ---
 transmart:
   server-url: ${TRANSMART_API_SERVER_URL}
   api-version: v2
 
 keycloak:
-  auth-server-url: ${KEYCLOAK_SERVER_URL}
+  auth-server-url: ${KEYCLOAK_SERVER_URL}/auth
   realm: ${KEYCLOAK_REALM}
   resource: ${KEYCLOAK_CLIENT_ID}
 
@@ -30,5 +30,5 @@ exec java -jar -server \
         "-Dmail.mime.decodeparameters=true" \
         "-Djava.security.egd=file:///dev/urandom" \
         "-Dserver.port=${APP_PORT}" \
-        "-Dspring.config.location=/${APP_CONFIG_DIR}" \
+        "-Dspring.config.location=${APP_CONFIG_FILE}" \
     "gb-backend-${GB_BACKEND_VERSION}.war"