From 10d193b2e6946c1b46cb7cb597c2e343bd2e8bef Mon Sep 17 00:00:00 2001 From: riccardomodanese Date: Thu, 20 Feb 2025 10:06:07 +0100 Subject: [PATCH] :fix: fixes event and service bus env variable to different Dockerfile Signed-off-by: riccardomodanese --- assembly/api/docker/Dockerfile | 14 ++++++++++++-- assembly/broker-artemis/docker/Dockerfile | 14 ++++++++++++-- assembly/consumer/lifecycle/docker/Dockerfile | 14 ++++++++++++-- assembly/consumer/telemetry/docker/Dockerfile | 14 ++++++++++++-- assembly/job-engine/docker/Dockerfile | 14 ++++++++++++-- assembly/service/authentication/docker/Dockerfile | 12 ++++++------ 6 files changed, 66 insertions(+), 16 deletions(-) diff --git a/assembly/api/docker/Dockerfile b/assembly/api/docker/Dockerfile index f46b30b8d7c..c3ebe4035c9 100644 --- a/assembly/api/docker/Dockerfile +++ b/assembly/api/docker/Dockerfile @@ -24,7 +24,12 @@ ENV DATASTORE_ADDR es:9200 ENV SQL_DB_ADDR db ENV SQL_DB_PORT 3306 -ENV SERVICE_BROKER_ADDR amqp://events-broker:5672 +ENV EVENT_BROKER_URL=${EVENT_BROKER_URL:-amqp://events-broker:5672} +ENV EVENT_BROKER_USERNAME=${EVENT_BROKER_USERNAME:-kapua-sys} +ENV EVENT_BROKER_PASSWORD=${EVENT_BROKER_PASSWORD:-kapua-password} +ENV SERVICE_BROKER_URL=${SERVICE_BROKER_URL:-amqp://events-broker:5672} +ENV SERVICE_BROKER_USERNAME=${SERVICE_BROKER_USERNAME:-kapua-sys} +ENV SERVICE_BROKER_PASSWORD=${SERVICE_BROKER_PASSWORD:-kapua-password} ENV JOB_ENGINE_BASE_ADDR http://job-engine:8080/v1 @@ -35,7 +40,12 @@ ENV JAVA_OPTS "-Dapi.cors.origins.allowed=\${API_CORS_ORIGINS_ALLOWED} \ -Dcommons.db.connection.port=\${SQL_DB_PORT} \ -Dbroker.host=\${BROKER_ADDR} \ -Ddatastore.elasticsearch.nodes=\${DATASTORE_ADDR} \ - -Dcommons.eventbus.url=\${SERVICE_BROKER_ADDR} \ + -Dcommons.eventbus.url="${EVENT_BROKER_URL}" \ + -Dcommons.eventbus.username="${EVENT_BROKER_USERNAME}" \ + -Dcommons.eventbus.password="${EVENT_BROKER_PASSWORD}" \ + -Dcommons.servicebus.url="${SERVICE_BROKER_URL}" \ + -Dcommons.servicebus.username="${SERVICE_BROKER_USERNAME}" \ + -Dcommons.servicebus.password="${SERVICE_BROKER_PASSWORD}" \ -Dcertificate.jwt.private.key=file:///etc/opt/kapua/key.pk8 \ -Dcertificate.jwt.certificate=file:///etc/opt/kapua/cert.pem \ -Ddatastore.disable=\${KAPUA_DISABLE_DATASTORE:-false} \ diff --git a/assembly/broker-artemis/docker/Dockerfile b/assembly/broker-artemis/docker/Dockerfile index 550d3e20ab8..96d432de72d 100644 --- a/assembly/broker-artemis/docker/Dockerfile +++ b/assembly/broker-artemis/docker/Dockerfile @@ -24,7 +24,12 @@ ENV DATASTORE_CLIENT org.eclipse.kapua.service.elasticsearch.client.rest.RestEla ENV SQL_DB_ADDR db ENV SQL_DB_PORT 3306 -ENV SERVICE_BROKER_ADDR amqp://events-broker:5672 +ENV EVENT_BROKER_URL=${EVENT_BROKER_URL:-amqp://events-broker:5672} +ENV EVENT_BROKER_USERNAME=${EVENT_BROKER_USERNAME:-kapua-sys} +ENV EVENT_BROKER_PASSWORD=${EVENT_BROKER_PASSWORD:-kapua-password} +ENV SERVICE_BROKER_URL=${SERVICE_BROKER_URL:-amqp://events-broker:5672} +ENV SERVICE_BROKER_USERNAME=${SERVICE_BROKER_USERNAME:-kapua-sys} +ENV SERVICE_BROKER_PASSWORD=${SERVICE_BROKER_PASSWORD:-kapua-password} USER 0 @@ -36,7 +41,12 @@ RUN useradd -u 1002 -g 0 -d '/opt/artemis' -s '/sbin/nologin' artemis && \ ENV JAVA_ARGS "-Dcommons.db.schema.update=true \ -Dcommons.db.connection.host=\${SQL_DB_ADDR} \ -Dcommons.db.connection.port=\${SQL_DB_PORT} \ - -Dcommons.eventbus.url=\${SERVICE_BROKER_ADDR} \ + -Dcommons.eventbus.url="${EVENT_BROKER_URL}" \ + -Dcommons.eventbus.username="${EVENT_BROKER_USERNAME}" \ + -Dcommons.eventbus.password="${EVENT_BROKER_PASSWORD}" \ + -Dcommons.servicebus.url="${SERVICE_BROKER_URL}" \ + -Dcommons.servicebus.username="${SERVICE_BROKER_USERNAME}" \ + -Dcommons.servicebus.password="${SERVICE_BROKER_PASSWORD}" \ -Dbroker.ip=message-broker \ -Dlocator.class.impl=org.eclipse.kapua.locator.guice.GuiceLocatorImpl \ -Dlocator.guice.stage=PRODUCTION \ diff --git a/assembly/consumer/lifecycle/docker/Dockerfile b/assembly/consumer/lifecycle/docker/Dockerfile index 5c4c8cca761..45cec44bd16 100644 --- a/assembly/consumer/lifecycle/docker/Dockerfile +++ b/assembly/consumer/lifecycle/docker/Dockerfile @@ -25,7 +25,12 @@ ENV CONSUMER_HOST=${CONSUMER_HOST:-lifecycle} ENV SQL_DB_ADDR db ENV SQL_DB_PORT 3306 -ENV SERVICE_BROKER_ADDR amqp://events-broker:5672 +ENV EVENT_BROKER_URL=${EVENT_BROKER_URL:-amqp://events-broker:5672} +ENV EVENT_BROKER_USERNAME=${EVENT_BROKER_USERNAME:-kapua-sys} +ENV EVENT_BROKER_PASSWORD=${EVENT_BROKER_PASSWORD:-kapua-password} +ENV SERVICE_BROKER_URL=${SERVICE_BROKER_URL:-amqp://events-broker:5672} +ENV SERVICE_BROKER_USERNAME=${SERVICE_BROKER_USERNAME:-kapua-sys} +ENV SERVICE_BROKER_PASSWORD=${SERVICE_BROKER_PASSWORD:-kapua-password} ENV JOB_ENGINE_BASE_ADDR http://job-engine:8080/v1 ENV JAVA_OPTS "-Dcommons.db.schema.update=true \ @@ -34,7 +39,12 @@ ENV JAVA_OPTS "-Dcommons.db.schema.update=true \ -Dlocator.guice.stage=PRODUCTION \ -Dbroker.host=\${BROKER_HOST} \ -Dbroker.port=\${BROKER_PORT} \ - -Dcommons.eventbus.url=\${SERVICE_BROKER_ADDR} \ + -Dcommons.eventbus.url="${EVENT_BROKER_URL}" \ + -Dcommons.eventbus.username="${EVENT_BROKER_USERNAME}" \ + -Dcommons.eventbus.password="${EVENT_BROKER_PASSWORD}" \ + -Dcommons.servicebus.url="${SERVICE_BROKER_URL}" \ + -Dcommons.servicebus.username="${SERVICE_BROKER_USERNAME}" \ + -Dcommons.servicebus.password="${SERVICE_BROKER_PASSWORD}" \ -Dconsumer.jaxb_context_class_name=org.eclipse.kapua.consumer.lifecycle.LifecycleJAXBContextProvider \ -Djob.engine.base.url=\${JOB_ENGINE_BASE_ADDR} \ -Dcertificate.jwt.private.key=file:///etc/opt/kapua/key.pk8 \ diff --git a/assembly/consumer/telemetry/docker/Dockerfile b/assembly/consumer/telemetry/docker/Dockerfile index 0a7b363d1e5..7358e34bc67 100644 --- a/assembly/consumer/telemetry/docker/Dockerfile +++ b/assembly/consumer/telemetry/docker/Dockerfile @@ -28,7 +28,12 @@ ENV DATASTORE_CLIENT org.eclipse.kapua.service.datastore.client.rest.RestDatasto ENV SQL_DB_ADDR db ENV SQL_DB_PORT 3306 -ENV SERVICE_BROKER_ADDR amqp://events-broker:5672 +ENV EVENT_BROKER_URL=${EVENT_BROKER_URL:-amqp://events-broker:5672} +ENV EVENT_BROKER_USERNAME=${EVENT_BROKER_USERNAME:-kapua-sys} +ENV EVENT_BROKER_PASSWORD=${EVENT_BROKER_PASSWORD:-kapua-password} +ENV SERVICE_BROKER_URL=${SERVICE_BROKER_URL:-amqp://events-broker:5672} +ENV SERVICE_BROKER_USERNAME=${SERVICE_BROKER_USERNAME:-kapua-sys} +ENV SERVICE_BROKER_PASSWORD=${SERVICE_BROKER_PASSWORD:-kapua-password} ENV JAVA_OPTS "-Dcommons.db.schema.update=true \ -Dcommons.db.connection.host=\${SQL_DB_ADDR} \ @@ -39,7 +44,12 @@ ENV JAVA_OPTS "-Dcommons.db.schema.update=true \ -Ddatastore.client.class=\${DATASTORE_CLIENT} \ -Dbroker.host=\${BROKER_HOST} \ -Dbroker.port=\${BROKER_PORT} \ - -Dcommons.eventbus.url=\${SERVICE_BROKER_ADDR} \ + -Dcommons.eventbus.url="${EVENT_BROKER_URL}" \ + -Dcommons.eventbus.username="${EVENT_BROKER_USERNAME}" \ + -Dcommons.eventbus.password="${EVENT_BROKER_PASSWORD}" \ + -Dcommons.servicebus.url="${SERVICE_BROKER_URL}" \ + -Dcommons.servicebus.username="${SERVICE_BROKER_USERNAME}" \ + -Dcommons.servicebus.password="${SERVICE_BROKER_PASSWORD}" \ -Dcertificate.jwt.private.key=file:///etc/opt/kapua/key.pk8 \ -Dcertificate.jwt.certificate=file:///etc/opt/kapua/cert.pem \ -Dcipher.key=\${CIPHER_KEY} \ diff --git a/assembly/job-engine/docker/Dockerfile b/assembly/job-engine/docker/Dockerfile index b5384962748..0327901483f 100644 --- a/assembly/job-engine/docker/Dockerfile +++ b/assembly/job-engine/docker/Dockerfile @@ -24,7 +24,12 @@ ENV DATASTORE_ADDR es:9200 ENV SQL_DB_ADDR db ENV SQL_DB_PORT 3306 -ENV SERVICE_BROKER_ADDR amqp://events-broker:5672 +ENV EVENT_BROKER_URL=${EVENT_BROKER_URL:-amqp://events-broker:5672} +ENV EVENT_BROKER_USERNAME=${EVENT_BROKER_USERNAME:-kapua-sys} +ENV EVENT_BROKER_PASSWORD=${EVENT_BROKER_PASSWORD:-kapua-password} +ENV SERVICE_BROKER_URL=${SERVICE_BROKER_URL:-amqp://events-broker:5672} +ENV SERVICE_BROKER_USERNAME=${SERVICE_BROKER_USERNAME:-kapua-sys} +ENV SERVICE_BROKER_PASSWORD=${SERVICE_BROKER_PASSWORD:-kapua-password} ENV JAVA_OPTS "-Dcommons.db.schema.update=true \ -Dcommons.db.connection.host=\${SQL_DB_ADDR} \ @@ -32,7 +37,12 @@ ENV JAVA_OPTS "-Dcommons.db.schema.update=true \ -Dlocator.guice.stage=PRODUCTION \ -Dbroker.host=\${BROKER_ADDR} \ -Ddatastore.elasticsearch.nodes=\${DATASTORE_ADDR} \ - -Dcommons.eventbus.url=\${SERVICE_BROKER_ADDR} \ + -Dcommons.eventbus.url="${EVENT_BROKER_URL}" \ + -Dcommons.eventbus.username="${EVENT_BROKER_USERNAME}" \ + -Dcommons.eventbus.password="${EVENT_BROKER_PASSWORD}" \ + -Dcommons.servicebus.url="${SERVICE_BROKER_URL}" \ + -Dcommons.servicebus.username="${SERVICE_BROKER_USERNAME}" \ + -Dcommons.servicebus.password="${SERVICE_BROKER_PASSWORD}" \ -Dcertificate.jwt.private.key=file:///etc/opt/kapua/key.pk8 \ -Dcertificate.jwt.certificate=file:///etc/opt/kapua/cert.pem \ -Ddatastore.disable=\${KAPUA_DISABLE_DATASTORE:-false} \ diff --git a/assembly/service/authentication/docker/Dockerfile b/assembly/service/authentication/docker/Dockerfile index fe9d14c3033..2e368ee1179 100644 --- a/assembly/service/authentication/docker/Dockerfile +++ b/assembly/service/authentication/docker/Dockerfile @@ -15,12 +15,12 @@ FROM @docker.account@/java-base COPY maven / -ENV SERVICE_BROKER_URL=${SERVICE_BROKER_URL:-amqp://events-broker:5672} -ENV SERVICE_BROKER_USERNAME=${SERVICE_BROKER_USERNAME:-kapua-sys} -ENV SERVICE_BROKER_PASSWORD=${SERVICE_BROKER_PASSWORD:-kapua-password} ENV EVENT_BROKER_URL=${EVENT_BROKER_URL:-amqp://events-broker:5672} ENV EVENT_BROKER_USERNAME=${EVENT_BROKER_USERNAME:-kapua-sys} ENV EVENT_BROKER_PASSWORD=${EVENT_BROKER_PASSWORD:-kapua-password} +ENV SERVICE_BROKER_URL=${SERVICE_BROKER_URL:-amqp://events-broker:5672} +ENV SERVICE_BROKER_USERNAME=${SERVICE_BROKER_USERNAME:-kapua-sys} +ENV SERVICE_BROKER_PASSWORD=${SERVICE_BROKER_PASSWORD:-kapua-password} ENV SERVICE_HOST=${SERVICE_HOST:-authentication} ENV SQL_DB_ADDR db @@ -33,11 +33,11 @@ ENV JAVA_OPTS -Dcommons.db.schema.update=true \ -Dcommons.eventbus.url="${EVENT_BROKER_URL}" \ -Dcommons.eventbus.username="${EVENT_BROKER_USERNAME}" \ -Dcommons.eventbus.password="${EVENT_BROKER_PASSWORD}" \ - -Dcertificate.jwt.private.key=file:///etc/opt/kapua/key.pk8 \ - -Dcertificate.jwt.certificate=file:///etc/opt/kapua/cert.pem \ -Dcommons.servicebus.url="${SERVICE_BROKER_URL}" \ -Dcommons.servicebus.username="${SERVICE_BROKER_USERNAME}" \ - -Dcommons.servicebus.password="${SERVICE_BROKER_PASSWORD}" + -Dcommons.servicebus.password="${SERVICE_BROKER_PASSWORD}" \ + -Dcertificate.jwt.private.key=file:///etc/opt/kapua/key.pk8 \ + -Dcertificate.jwt.certificate=file:///etc/opt/kapua/cert.pem EXPOSE 8080