From d6939e03f5935d1fc4ab973b57573bfd9afc3dbf Mon Sep 17 00:00:00 2001 From: Domenico Date: Fri, 18 Sep 2020 14:23:11 +0200 Subject: [PATCH 1/4] Added spring application config environment --- .env | 8 +++++++- docker-compose.yml | 32 +++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 10af57b..2d3c110 100644 --- a/.env +++ b/.env @@ -5,10 +5,15 @@ DOCKER_IMAGE_REPO=gk.eng.it:5000 PUBLIC_DOMAIN=localhost #PUBLIC_DOMAIN=217.172.12.153 -# Port +# Ports GK_CONNECTOR_PORT=8087 +GK_CONNECTOR_INTERNAL_PORT=8080 GK_FHIR_SERVER_PORT=8085 +GK_FHIR_SERVER_INTERNAL_PORT=8080 RDF4J_WORKBENCH=8080 +RDF4J_WORKBENCH_INTERNAL=8080 +KEYCLOAK_PORT=8082 +KEYCLOAK_INTERNAL_PORT=8080 # rdf4j version RDF4J_VERSION=2.5.1 @@ -17,6 +22,7 @@ RDF4J_VERSION=2.5.1 DATABASE_ROOT_PASSWORD=gk_admin DATABASE_USER=gk_admin DATABASE_PASSWORD=gk_admin +DATABASE_PORT=3306 #keyclock KEYCLOAK_USER=gk_admin diff --git a/docker-compose.yml b/docker-compose.yml index d39b862..0254fdf 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,17 @@ services: #build: ../gk-integration-engine image: ${DOCKER_IMAGE_REPO}/gk-integration-engine ports: - - "${GK_CONNECTOR_PORT}:8080" + - "${GK_CONNECTOR_PORT}:${GK_CONNECTOR_INTERNAL_PORT}" + environment: + SPRING_APPLICATION_JSON: '{ + "server.port": "${GK_CONNECTOR_INTERNAL_PORT}", + "server.fhir.url": "http://gk-fhir-server:${GK_FHIR_SERVER_INTERNAL_PORT}/gk-fhir-server/fhir/", + "rdf4j.server": "http://rdf4j:${RDF4J_WORKBENCH_INTERNAL}/rdf4j-server/repositories/gatekeeper/statements", + "keycloak.auth-server-url": "http://authz:${KEYCLOAK_INTERNAL_PORT}/auth", + "keycloak.resource": "keycloak.resource", + "gkie.keycloak.roles": "gk-role", + "keycloak.realm":"GKRealm" + }' gk-fhir-server: @@ -16,7 +26,19 @@ services: #build: ../gk-fhir-server image: ${DOCKER_IMAGE_REPO}/gk-fhir-server ports: - - "${GK_FHIR_SERVER_PORT}:8080" + - "${GK_FHIR_SERVER_PORT}:${GK_FHIR_SERVER_INTERNAL_PORT}" + environment: + SPRING_APPLICATION_JSON: '{ + "server_address": "http://${PUBLIC_DOMAIN}:${GK_FHIR_SERVER_INTERNAL_PORT}/gk-fhir-server/fhir/", + "test.port": "${GK_FHIR_SERVER_INTERNAL_PORT}", #this port must be the same of map ports + "datasource.driver": "org.mariadb.jdbc.Driver", + "datasource.url": "jdbc:mysql://db:${DATABASE_PORT}/gk-fhir-db?autoReconnect=true&useSSL=false&createDatabaseIfNotExist=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", + "datasource.name": "${DATABASE_USER}", + "datasource.password": "${DATABASE_PASSWORD}", + "hibernate.dialect": "org.hibernate.dialect.MariaDB53Dialect", + "reffile": "rdf-files", + "rdf4jworkbench": "http://rdf4j:${RDF4J_WORKBENCH_INTERNAL}/rdf4j-server/repositories/gatekeeper/statements" + }' volumes: - gk-fhir-server-data:/usr/local/tomcat/target depends_on: @@ -29,7 +51,7 @@ services: container_name: rdf4j image: yyz1989/rdf4j ports: - - "${RDF4J_WORKBENCH}:8080" + - "${RDF4J_WORKBENCH}:${RDF4J_WORKBENCH_INTERNAL}" volumes: - rdf4j_data:/opt/eclipse-rdf4j-${RDF4J_VERSION}/data #networks: @@ -40,7 +62,7 @@ services: image: 'jboss/keycloak' container_name: authz ports: - - '8082:8080' + - "${KEYCLOAK_PORT}:${KEYCLOAK_INTERNAL_PORT}" environment: DB_VENDOR: mariadb DB_ADDR: db @@ -76,7 +98,7 @@ services: image: 'bitnami/mariadb:10.4-debian-10' # ~90MB container_name: db ports: - - '3306:3306' + - "${DATABASE_PORT}:${DATABASE_PORT}" environment: #- MARIADB_DATABASE=gk-fhir-db - MARIADB_MULTIPLE_DATABASES=gk-fhir-db,keycloak -- GitLab From 71c77599e5e9254652ef86a8aed00c2ba8d8750f Mon Sep 17 00:00:00 2001 From: Domenico Date: Fri, 18 Sep 2020 18:57:35 +0200 Subject: [PATCH 2/4] Added spring application json environment --- .../docker-compose.yml | 41 +++++++++++++++---- docker-compose.yml | 7 ++-- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/docker-compose for local build/docker-compose.yml b/docker-compose for local build/docker-compose.yml index 5f07b3e..3d2c7ac 100644 --- a/docker-compose for local build/docker-compose.yml +++ b/docker-compose for local build/docker-compose.yml @@ -6,9 +6,20 @@ services: gk-integration-engine: container_name: gk-integration-engine build: ../../gk-integration-engine - #image: ${DOCKER_IMAGE_REPO}/gk-integration-engine + image: ${DOCKER_IMAGE_REPO}/gk-integration-engine + ports: - - "${GK_CONNECTOR_PORT}:8080" + - "${GK_CONNECTOR_PORT}:${GK_CONNECTOR_INTERNAL_PORT}" + environment: + SPRING_APPLICATION_JSON: '{ + "server.port": "${GK_CONNECTOR_INTERNAL_PORT}", + "server.fhir.url": "http://gk-fhir-server:${GK_FHIR_SERVER_INTERNAL_PORT}/gk-fhir-server/fhir/", + "rdf4j.server": "http://rdf4j:${RDF4J_WORKBENCH_INTERNAL}/rdf4j-server/repositories/gatekeeper/statements", + "keycloak.auth-server-url": "http://authz:${KEYCLOAK_INTERNAL_PORT}/auth", + "keycloak.resource": "keycloak.resource", + "gkie.keycloak.roles": "gk-role", + "keycloak.realm":"GKRealm", + }' gk-fhir-server: @@ -16,7 +27,19 @@ services: build: ../../gk-fhir-server #image: ${DOCKER_IMAGE_REPO}/gk-fhir-server ports: - - "${GK_FHIR_SERVER_PORT}:8080" + - "${GK_FHIR_SERVER_PORT}:${GK_FHIR_SERVER_INTERNAL_PORT}" + environment: + SPRING_APPLICATION_JSON: '{ + "server_address": "http://${PUBLIC_DOMAIN}:${GK_FHIR_SERVER_INTERNAL_PORT}/gk-fhir-server/fhir/", + "test.port": "${GK_FHIR_SERVER_INTERNAL_PORT}", #this port must be the same of map ports + "datasource.driver": "org.mariadb.jdbc.Driver", + "datasource.url": "jdbc:mysql://db:${DATABASE_PORT}/gk-fhir-db?autoReconnect=true&useSSL=false&createDatabaseIfNotExist=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC", + "datasource.name": "${DATABASE_USER}", + "datasource.password": "${DATABASE_PASSWORD}", + "hibernate.dialect": "org.hibernate.dialect.MariaDB53Dialect", + "reffile": "rdf-files", + "rdf4jworkbench": "http://rdf4j:${RDF4J_WORKBENCH_INTERNAL}/rdf4j-server/repositories/gatekeeper/statements" + }' volumes: - gk-fhir-server-data:/usr/local/tomcat/target depends_on: @@ -29,7 +52,7 @@ services: container_name: rdf4j image: yyz1989/rdf4j ports: - - "${RDF4J_WORKBENCH}:8080" + - "${RDF4J_WORKBENCH}:${RDF4J_WORKBENCH_INTERNAL}" volumes: - rdf4j_data:/opt/eclipse-rdf4j-${RDF4J_VERSION}/data #networks: @@ -40,7 +63,7 @@ services: image: 'jboss/keycloak' container_name: authz ports: - - '8082:8080' + - "${KEYCLOAK_PORT}:${KEYCLOAK_INTERNAL_PORT}" environment: DB_VENDOR: mariadb DB_ADDR: db @@ -76,7 +99,7 @@ services: image: 'bitnami/mariadb:10.4-debian-10' # ~90MB container_name: db ports: - - '3306:3306' + - "${DATABASE_PORT}:${DATABASE_PORT}" environment: #- MARIADB_DATABASE=gk-fhir-db - MARIADB_MULTIPLE_DATABASES=gk-fhir-db,keycloak @@ -89,9 +112,9 @@ services: test: ["CMD", "mysqladmin", "ping", "--silent"] # restart: always volumes: - - ./../docker-mariadb/my_custom.cnf:/opt/bitnami/mariadb/conf/my_custom.cnf:ro # Enable encryption - - ./../docker-mariadb/encryption:/etc/encryption # Encryption keys - - ./../docker-mariadb/scripts:/docker-entrypoint-initdb.d # Create DBs + - ./docker-mariadb/my_custom.cnf:/opt/bitnami/mariadb/conf/my_custom.cnf:ro # Enable encryption + - ./docker-mariadb/encryption:/etc/encryption # Encryption keys + - ./docker-mariadb/scripts:/docker-entrypoint-initdb.d # Create DBs - db-data:/bitnami/mariadb #networks: # - db diff --git a/docker-compose.yml b/docker-compose.yml index 0254fdf..56a92be 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,7 @@ services: container_name: gk-integration-engine #build: ../gk-integration-engine image: ${DOCKER_IMAGE_REPO}/gk-integration-engine + ports: - "${GK_CONNECTOR_PORT}:${GK_CONNECTOR_INTERNAL_PORT}" environment: @@ -17,8 +18,8 @@ services: "keycloak.auth-server-url": "http://authz:${KEYCLOAK_INTERNAL_PORT}/auth", "keycloak.resource": "keycloak.resource", "gkie.keycloak.roles": "gk-role", - "keycloak.realm":"GKRealm" - }' + "keycloak.realm":"GKRealm", + }' gk-fhir-server: @@ -37,7 +38,7 @@ services: "datasource.password": "${DATABASE_PASSWORD}", "hibernate.dialect": "org.hibernate.dialect.MariaDB53Dialect", "reffile": "rdf-files", - "rdf4jworkbench": "http://rdf4j:${RDF4J_WORKBENCH_INTERNAL}/rdf4j-server/repositories/gatekeeper/statements" + "rdf4jworkbench": "http://rdf4j:${RDF4J_WORKBENCH_INTERNAL}/rdf4j-server/repositories/gatekeeper/statements" }' volumes: - gk-fhir-server-data:/usr/local/tomcat/target -- GitLab From 6c95092aea257f2b54a9cbe11fe0653c6809a8d2 Mon Sep 17 00:00:00 2001 From: Domenico Date: Fri, 18 Sep 2020 19:20:25 +0200 Subject: [PATCH 3/4] added new variables --- docker-compose for local build/.env | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-compose for local build/.env b/docker-compose for local build/.env index 10af57b..2d3c110 100644 --- a/docker-compose for local build/.env +++ b/docker-compose for local build/.env @@ -5,10 +5,15 @@ DOCKER_IMAGE_REPO=gk.eng.it:5000 PUBLIC_DOMAIN=localhost #PUBLIC_DOMAIN=217.172.12.153 -# Port +# Ports GK_CONNECTOR_PORT=8087 +GK_CONNECTOR_INTERNAL_PORT=8080 GK_FHIR_SERVER_PORT=8085 +GK_FHIR_SERVER_INTERNAL_PORT=8080 RDF4J_WORKBENCH=8080 +RDF4J_WORKBENCH_INTERNAL=8080 +KEYCLOAK_PORT=8082 +KEYCLOAK_INTERNAL_PORT=8080 # rdf4j version RDF4J_VERSION=2.5.1 @@ -17,6 +22,7 @@ RDF4J_VERSION=2.5.1 DATABASE_ROOT_PASSWORD=gk_admin DATABASE_USER=gk_admin DATABASE_PASSWORD=gk_admin +DATABASE_PORT=3306 #keyclock KEYCLOAK_USER=gk_admin -- GitLab From f7485e0011ec25a3ff81bb690b8a99e325b0ee9a Mon Sep 17 00:00:00 2001 From: Domenico Date: Fri, 18 Sep 2020 19:58:37 +0200 Subject: [PATCH 4/4] Fixed bugs --- docker-compose for local build/.env | 4 ++-- docker-compose for local build/docker-compose.yml | 2 +- docker-compose.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose for local build/.env b/docker-compose for local build/.env index 2d3c110..2e192f3 100644 --- a/docker-compose for local build/.env +++ b/docker-compose for local build/.env @@ -1,5 +1,5 @@ -DOCKER_IMAGE_REPO=gk.eng.it:5000 -#DOCKER_IMAGE_REPO=localhost:5000 +#DOCKER_IMAGE_REPO=gk.eng.it:5000 +DOCKER_IMAGE_REPO=localhost:5000 #Domain PUBLIC_DOMAIN=localhost diff --git a/docker-compose for local build/docker-compose.yml b/docker-compose for local build/docker-compose.yml index 3d2c7ac..1f25165 100644 --- a/docker-compose for local build/docker-compose.yml +++ b/docker-compose for local build/docker-compose.yml @@ -18,7 +18,7 @@ services: "keycloak.auth-server-url": "http://authz:${KEYCLOAK_INTERNAL_PORT}/auth", "keycloak.resource": "keycloak.resource", "gkie.keycloak.roles": "gk-role", - "keycloak.realm":"GKRealm", + "keycloak.realm":"GKRealm" }' diff --git a/docker-compose.yml b/docker-compose.yml index 56a92be..adc694d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: "keycloak.auth-server-url": "http://authz:${KEYCLOAK_INTERNAL_PORT}/auth", "keycloak.resource": "keycloak.resource", "gkie.keycloak.roles": "gk-role", - "keycloak.realm":"GKRealm", + "keycloak.realm": "GKRealm" }' -- GitLab