summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md7
-rw-r--r--deploy/docker-compose.yaml36
-rw-r--r--deploy/env-sample.env31
3 files changed, 48 insertions, 26 deletions
diff --git a/README.md b/README.md
index b743d92..8290dd1 100644
--- a/README.md
+++ b/README.md
@@ -129,11 +129,14 @@ docker build . -t "imageName"
## Deployment
*Ausführen als Docker Conatiner:*
-Wenn gewünscht, Änderungen in der `env` vornehmen. Beachten, dass *MONITORING_HTTP_PORT* über
-Host-Umgebung gesetzt werden muss (z.B. .env oder Parameter --env-file )
```bash
cd ./deploy
+cp env-sample.env .env
+```
+Wenn gewünscht, Änderungen in der `.env` vornehmen.
+
+```bash
docker compose up -d
```
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: {}
+
diff --git a/deploy/env-sample.env b/deploy/env-sample.env
index 63fde20..7399f7b 100644
--- a/deploy/env-sample.env
+++ b/deploy/env-sample.env
@@ -18,32 +18,33 @@ MARIADB_USER_PW=MySuperSecurePassword111
MARIADB_ROOT_PW=MySuperDuperSecurePassword111
# monitoring data db
-SPRING_DATASOURCE_URL:jdbc:mariadb://db:3306/$MARIADB_DB
-SPRING_DATASOURCE_PASSWORD: $MARIADB_USER_PW
-SPRING_DATASOURCE_USERNAME: dnpm_monitoring
+SPRING_DATASOURCE_URL=jdbc:mariadb://db:3306/$MARIADB_DB
+SPRING_DATASOURCE_PASSWORD=$MARIADB_USER_PW
+SPRING_DATASOURCE_USERNAME=dnpm_monitoring
## TARGET SYSTEMS CONFIG
# DIRECT BWHC
# in case of direct access to bwhc enter endpoint url here
APP_REST_URI=
-## Apache KAFKA
+## Apache KAFKA if APP_KAFKA_SERVERS and APP_KAFKA_TOPIC have value 'false' kafka support is disabled
# list of broker instances
-#APP_KAFKA_SERVERS=
+APP_KAFKA_SERVERS=false
# produce mtb files to this topic
-#APP_KAFKA_TOPIC=mtb-file-json
+APP_KAFKA_TOPIC=false
# here we receive responses from bwhc
-#APP_KAFKA_RESPONSE_TOPIC=
-#APP_KAFKA_GROUP_ID=dnpm
+APP_KAFKA_RESPONSE_TOPIC=dnpm-response
+APP_KAFKA_GROUP_ID=dnpm
# SSL or PLAINTEXT
SPRING_KAFKA_SECURITY_PROTOCOL=PLAINTEXT
-SPRING_KAFKA_SSL_TRUST-STORE-TYPE=PKCS12
-SPRING_KAFKA_SSL_TRUST-STORE-LOCATION=file://opt/kafka-certs/ca.p12}
-SPRING_KAFKA_SSL_TRUST-STORE-PASSWORD=
-SPRING_KAFKA_SSL_KEY-STORE-TYPE=PKCS12
-SPRING_KAFKA_SSL_KEY-STORE-LOCATION=file://opt/kafka-certs/user.p12}
-SPRING_KAFKA_SSL_KEY-STORE-PASSWORD=
-SPRING_KAFKA_PRODUCER_COMPRESSION-TYPE: gzip
+SPRING_KAFKA_SSL_TRUST_STORE_TYPE=PKCS12
+SPRING_KAFKA_SSL_TRUST_STORE_LOCATION=file://opt/kafka-certs/ca.p12
+SPRING_KAFKA_SSL_TRUST_STORE_PASSWORD=
+SPRING_KAFKA_SSL_KEY_STORE_TYPE=PKCS12
+SPRING_KAFKA_SSL_KEY_STORE_LOCATION=file://opt/kafka-certs/user.p12
+DNPM_PROCESSOR_KEY_STORE_PASSWORD=
+SPRING_KAFKA_PRODUCER_COMPRESSION_TYPE=gzip
+KAFKA_KEY_STORE_LOCATION=file://opt/kafka-certs/user.p12