From 480f165c7b7fb8b80326083af3b04f08d5b2be9b Mon Sep 17 00:00:00 2001 From: Jakub Lidke Date: Thu, 24 Aug 2023 13:48:46 +0200 Subject: chore: add deployment docker-compose.yaml and fitting env-sample.env file --- deploy/docker-compose.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 deploy/docker-compose.yaml (limited to 'deploy/docker-compose.yaml') diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml new file mode 100644 index 0000000..30c647c --- /dev/null +++ b/deploy/docker-compose.yaml @@ -0,0 +1,25 @@ +version: '3.7' + +services: + dnpm-etl-processor: + image: dnpm-elt-processor:latest + env_file: + - ./env-sample.env + depends_on: + - db + networks: + - dnpm_processor + + db: + image: mariadb:10 + environment: + MARIADB_DATABASE: dev + MARIADB_USER: dev + MARIADB_PASSWORD: dev + MARIADB_ROOT_PASSWORD: dev + expose: + - "3306" + networks: + - dnpm_processor +networks: + dnpm_processor: {} -- cgit v1.2.3 From bbea48322fa5a24ff61eef25ed84f4966bf49c42 Mon Sep 17 00:00:00 2001 From: Jakub Lidke Date: Fri, 25 Aug 2023 12:50:29 +0200 Subject: chore: added deployment port mapping for monitoring access --- deploy/docker-compose.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'deploy/docker-compose.yaml') diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index 30c647c..8dccd4c 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -1,4 +1,4 @@ -version: '3.7' + services: dnpm-etl-processor: @@ -9,6 +9,8 @@ services: - db networks: - dnpm_processor + ports: + - "${MONITORING_HTTP_PORT:-8080}:8080" db: image: mariadb:10 -- cgit v1.2.3 From 01ff53ab235488cb23e8aa335be7bf58c0e7bf53 Mon Sep 17 00:00:00 2001 From: Jakub Lidke Date: Fri, 25 Aug 2023 13:42:07 +0200 Subject: chore: deployment environment has maria db entries --- deploy/docker-compose.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'deploy/docker-compose.yaml') diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index 8dccd4c..a1090ec 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -15,12 +15,12 @@ services: db: image: mariadb:10 environment: - MARIADB_DATABASE: dev - MARIADB_USER: dev - MARIADB_PASSWORD: dev - MARIADB_ROOT_PASSWORD: dev - expose: - - "3306" + MARIADB_DATABASE: ${MARIADB_DB} + MARIADB_USER: ${MARIADB_USER} + MARIADB_PASSWORD: ${MARIADB_USER_PW} + MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PW} + ports: + - "3306:3306" networks: - dnpm_processor networks: -- cgit v1.2.3 From 25143745c4691646112266006d68161bcb359bdd Mon Sep 17 00:00:00 2001 From: Jakub Lidke Date: Mon, 28 Aug 2023 12:54:14 +0200 Subject: chore: added deployment docker-compose.yaml and env-sample.env added. --- deploy/docker-compose.yaml | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'deploy/docker-compose.yaml') diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index a1090ec..5e9d8ef 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -2,13 +2,34 @@ services: dnpm-etl-processor: - image: dnpm-elt-processor:latest - env_file: - - ./env-sample.env + image: ghcr.io/ccc-mf/etl-processor:latest + environment: + SPRING_KAFKA_SECURITY_PROTOCOL: ${SPRING_KAFKA_SECURITY_PROTOCOL} + SPRING_KAFKA_SSL_TRUST-STORE-TYPE: ${SPRING_KAFKA_SSL_TRUST_STORE_TYPE} + SPRING_KAFKA_SSL_TRUST-STORE-LOCATION: ${SPRING_KAFKA_SSL_TRUST_STORE_LOCATION} + SPRING_KAFKA_SSL_TRUST-STORE-PASSWORD: ${SPRING_KAFKA_SSL_TRUST_STORE_PASSWORD} + SPRING_KAFKA_SSL_KEY-STORE-TYPE: ${SPRING_KAFKA_SSL_KEY_STORE_TYPE} + SPRING_KAFKA_SSL_KEY-STORE-LOCATION: ${KAFKA_KEY_STORE_LOCATION} + SPRING_KAFKA_SSL_KEY-STORE-PASSWORD: ${DNPM_PROCESSOR_KEY_STORE_PASSWORD} + SPRING_KAFKA_PRODUCER_COMPRESSION-TYPE: ${SPRING_KAFKA_PRODUCER_COMPRESSION_TYPE} + APP_KAFKA_TOPIC: ${APP_KAFKA_TOPIC} + APP_KAFKA_SERVERS: ${APP_KAFKA_SERVERS} + APP_KAFKA_GROUP_ID: ${APP_KAFKA_GROUP_ID} + APP_KAFKA_RESPONSE_TOPIC: ${APP_KAFKA_RESPONSE_TOPIC} + APP_REST_URI: ${APP_REST_URI} + SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL} + SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} + SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME} + APP_PSEUDONYMIZE_GPAS_SSLCALOCATION: ${APP_PSEUDONYMIZE_GPAS_SSLCALOCATION} + APP_PSEUDONYMIZE_GPAS_PASSWORD: ${APP_PSEUDONYMIZE_GPAS_PASSWORD} + APP_PSEUDONYMIZE_GPAS_USERNAME: ${APP_PSEUDONYMIZE_GPAS_USERNAME} + APP_PSEUDONYMIZE_GPAS_TARGET: ${APP_PSEUDONYMIZE_GPAS_TARGET} + APP_PSEUDONYMIZE_GPAS_URI: ${APP_PSEUDONYMIZE_GPAS_URI} + APP_PSEUDONYMIZE_PREFIX: ${APP_PSEUDONYMIZE_PREFIX} + APP_PSEUDONYMIZE_GENERATOR: ${APP_PSEUDONYMIZE_GENERATOR} + depends_on: - db - networks: - - dnpm_processor ports: - "${MONITORING_HTTP_PORT:-8080}:8080" @@ -21,7 +42,4 @@ services: MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PW} ports: - "3306:3306" - networks: - - dnpm_processor -networks: - dnpm_processor: {} + -- cgit v1.2.3 From e24be0d32592623ae2fc0e3d7f3618437036d72a Mon Sep 17 00:00:00 2001 From: Jakub Lidke Date: Wed, 30 Aug 2023 11:50:24 +0200 Subject: chore: cleanup deployment docker-compose.yaml and env-sample.env. added 'DNPM' prefix for better integration into productive environment. --- deploy/docker-compose.yaml | 72 ++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 31 deletions(-) (limited to 'deploy/docker-compose.yaml') diff --git a/deploy/docker-compose.yaml b/deploy/docker-compose.yaml index 5e9d8ef..d575d09 100644 --- a/deploy/docker-compose.yaml +++ b/deploy/docker-compose.yaml @@ -4,42 +4,52 @@ services: dnpm-etl-processor: image: ghcr.io/ccc-mf/etl-processor:latest environment: - SPRING_KAFKA_SECURITY_PROTOCOL: ${SPRING_KAFKA_SECURITY_PROTOCOL} - SPRING_KAFKA_SSL_TRUST-STORE-TYPE: ${SPRING_KAFKA_SSL_TRUST_STORE_TYPE} - SPRING_KAFKA_SSL_TRUST-STORE-LOCATION: ${SPRING_KAFKA_SSL_TRUST_STORE_LOCATION} - SPRING_KAFKA_SSL_TRUST-STORE-PASSWORD: ${SPRING_KAFKA_SSL_TRUST_STORE_PASSWORD} - SPRING_KAFKA_SSL_KEY-STORE-TYPE: ${SPRING_KAFKA_SSL_KEY_STORE_TYPE} - SPRING_KAFKA_SSL_KEY-STORE-LOCATION: ${KAFKA_KEY_STORE_LOCATION} + LOGGING_LEVEL_DEV: ${DNPM_LOG_LEVEL:-INFO} + SPRING_KAFKA_SECURITY_PROTOCOL: ${DNPM_KAFKA_SECURITY_PROTOCOL:-SSL} + SPRING_KAFKA_SSL_TRUST-STORE-TYPE: PKCS12 + SPRING_KAFKA_SSL_TRUST-STORE-LOCATION: /opt/dnpm-processor/ssl/truststore.jks + SPRING_KAFKA_SSL_TRUST-STORE-PASSWORD: ${KAFKA_TRUST_STORE_PASSWORD} + SPRING_KAFKA_SSL_KEY-STORE-TYPE: PKCS12 + SPRING_KAFKA_SSL_KEY-STORE-LOCATION: /opt/dnpm-processor/ssl/keystore.jks SPRING_KAFKA_SSL_KEY-STORE-PASSWORD: ${DNPM_PROCESSOR_KEY_STORE_PASSWORD} - SPRING_KAFKA_PRODUCER_COMPRESSION-TYPE: ${SPRING_KAFKA_PRODUCER_COMPRESSION_TYPE} - APP_KAFKA_TOPIC: ${APP_KAFKA_TOPIC} - APP_KAFKA_SERVERS: ${APP_KAFKA_SERVERS} - APP_KAFKA_GROUP_ID: ${APP_KAFKA_GROUP_ID} - APP_KAFKA_RESPONSE_TOPIC: ${APP_KAFKA_RESPONSE_TOPIC} - APP_REST_URI: ${APP_REST_URI} - SPRING_DATASOURCE_URL: ${SPRING_DATASOURCE_URL} - SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD} - SPRING_DATASOURCE_USERNAME: ${SPRING_DATASOURCE_USERNAME} - APP_PSEUDONYMIZE_GPAS_SSLCALOCATION: ${APP_PSEUDONYMIZE_GPAS_SSLCALOCATION} - APP_PSEUDONYMIZE_GPAS_PASSWORD: ${APP_PSEUDONYMIZE_GPAS_PASSWORD} - APP_PSEUDONYMIZE_GPAS_USERNAME: ${APP_PSEUDONYMIZE_GPAS_USERNAME} - APP_PSEUDONYMIZE_GPAS_TARGET: ${APP_PSEUDONYMIZE_GPAS_TARGET} - APP_PSEUDONYMIZE_GPAS_URI: ${APP_PSEUDONYMIZE_GPAS_URI} - APP_PSEUDONYMIZE_PREFIX: ${APP_PSEUDONYMIZE_PREFIX} - APP_PSEUDONYMIZE_GENERATOR: ${APP_PSEUDONYMIZE_GENERATOR} + SPRING_KAFKA_PRODUCER_COMPRESSION-TYPE: gzip + APP_KAFKA_TOPIC: ${DNPM_KAFKA_TOPIC} + APP_KAFKA_SERVERS: ${KAFKA_BROKERS} + APP_KAFKA_GROUP_ID: ${DNPM_KAFKA_GROUP_ID} + APP_KAFKA_RESPONSE_TOPIC: ${DNPM_KAFKA_RESPONSE_TOPIC} + APP_REST_URI: ${DNPM_BWHC_REST_URI} + SPRING_DATASOURCE_URL: ${DNPM_DATASOURCE_URL} + SPRING_DATASOURCE_PASSWORD: ${DNPM_MARIADB_USER_PW} + SPRING_DATASOURCE_USERNAME: ${DNPM_MARIADB_DB} + APP_PSEUDONYMIZE_GPAS_SSLCALOCATION: /workspace/opt/dnpm-processor/ssl/mosaic.crt + APP_PSEUDONYMIZE_GPAS_PASSWORD: ${DNPM_PSEUDONYMIZE_GPAS_PASSWORD} + APP_PSEUDONYMIZE_GPAS_USERNAME: ${DNPM_PSEUDONYMIZE_GPAS_USERNAME} + APP_PSEUDONYMIZE_GPAS_TARGET: ${DNPM_PSEUDONYMIZE_GPAS_TARGET} + APP_PSEUDONYMIZE_GPAS_URI: ${DNPM_PSEUDONYMIZE_GPAS_URI} + APP_PSEUDONYMIZE_PREFIX: ${DNPM_APP_PSEUDONYMIZE_PREFIX} + APP_PSEUDONYMIZER: ${DNPM_PSEUDONYMIZE_GENERATOR} + volumes: + - /etc/localtime:/etc/localtime:ro + - /etc/timezone:/etc/timezone:ro + #- ${DNPM_TO_SSL_KEYSTORE_LOCATION}:/workspace/opt/dnpm-processor/ssl/keystore.jks:ro + #- ${KAFKA_TRUST_STORE_LOCATION}:/workspace/opt/dnpm-processor/ssl/truststore.jks:ro + #- ${DNPM_PSEUDONYMIZE_GPAS_SSLCALOCATION}:/workspace/opt/dnpm-processor/ssl/mosaic.crt depends_on: - - db + - dnpm-monitor-db ports: - - "${MONITORING_HTTP_PORT:-8080}:8080" + - "${DNPM_MONITORING_HTTP_PORT:-8080}:8080" - db: + # todo add volume + dnpm-monitor-db: image: mariadb:10 environment: - MARIADB_DATABASE: ${MARIADB_DB} - MARIADB_USER: ${MARIADB_USER} - MARIADB_PASSWORD: ${MARIADB_USER_PW} - MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PW} - ports: - - "3306:3306" + MARIADB_DATABASE: ${DNPM_MARIADB_DB} + MARIADB_USER: ${DNPM_MARIADB_USER} + MARIADB_PASSWORD: ${DNPM_MARIADB_USER_PW} + MARIADB_ROOT_PASSWORD: ${DNPM_MARIADB_ROOT_PW} + expose: + - "3306" + + -- cgit v1.2.3