diff --git a/auditlog/README.md b/auditlog/README.md index e83f4b75..5b509d3a 100755 --- a/auditlog/README.md +++ b/auditlog/README.md @@ -22,7 +22,7 @@ $ mvn clean package ``` ```console -$ export DEBEZIUM_VERSION=1.8 +$ export DEBEZIUM_VERSION=2.0 $ docker-compose up --build ``` diff --git a/auditlog/admin-service/pom.xml b/auditlog/admin-service/pom.xml index 6e98e422..ea08cd3c 100644 --- a/auditlog/admin-service/pom.xml +++ b/auditlog/admin-service/pom.xml @@ -6,8 +6,8 @@ auditing-admin-service 1.0-SNAPSHOT - 1.8 - 1.8 + 11 + 11 UTF-8 UTF-8 1.4.2.Final diff --git a/auditlog/admin-service/src/main/docker/Dockerfile.jvm b/auditlog/admin-service/src/main/docker/Dockerfile.jvm index 39cbd25f..a5d8995b 100644 --- a/auditlog/admin-service/src/main/docker/Dockerfile.jvm +++ b/auditlog/admin-service/src/main/docker/Dockerfile.jvm @@ -15,7 +15,7 @@ # ### # FROM fabric8/java-alpine-openjdk8-jre -FROM fabric8/java-centos-openjdk8-jdk +FROM fabric8/java-centos-openjdk11-jdk ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" ENV AB_ENABLED=jmx_exporter COPY target/lib/* /deployments/lib/ diff --git a/auditlog/admin-service/src/main/java/io/debezium/demos/auditing/admin/wih/SendTransactionEventWIHandler.java b/auditlog/admin-service/src/main/java/io/debezium/demos/auditing/admin/wih/SendTransactionEventWIHandler.java index 21340a6d..1456e186 100644 --- a/auditlog/admin-service/src/main/java/io/debezium/demos/auditing/admin/wih/SendTransactionEventWIHandler.java +++ b/auditlog/admin-service/src/main/java/io/debezium/demos/auditing/admin/wih/SendTransactionEventWIHandler.java @@ -59,7 +59,6 @@ public void executeWorkItem(WorkItem workItem, WorkItemManager manager) { @Override public void abortWorkItem(WorkItem workItem, WorkItemManager manager) { - } @Override diff --git a/auditlog/docker-compose.yaml b/auditlog/docker-compose.yaml index adb59796..744f00a2 100644 --- a/auditlog/docker-compose.yaml +++ b/auditlog/docker-compose.yaml @@ -50,11 +50,6 @@ services: - 8080:8080 links: - vegetables-db - environment: - - QUARKUS_DATASOURCE_URL=jdbc:postgresql://vegetables-db:5432/vegetablesdb?currentSchema=inventory - #depends_on: - # vegetable-db: - # condition: service_healthy log-enricher: image: debezium-examples/auditing-log-enricher:${DEBEZIUM_VERSION} diff --git a/auditlog/log-enricher/.dockerignore b/auditlog/log-enricher/.dockerignore index b86c7ac3..94810d00 100644 --- a/auditlog/log-enricher/.dockerignore +++ b/auditlog/log-enricher/.dockerignore @@ -1,4 +1,5 @@ * !target/*-runner !target/*-runner.jar -!target/lib/* \ No newline at end of file +!target/lib/* +!target/quarkus-app/* \ No newline at end of file diff --git a/auditlog/log-enricher/pom.xml b/auditlog/log-enricher/pom.xml index 92eb4041..ddbad135 100644 --- a/auditlog/log-enricher/pom.xml +++ b/auditlog/log-enricher/pom.xml @@ -8,10 +8,10 @@ UTF-8 2.22.0 - 1.4.2.Final + 2.11.0.Final UTF-8 - 1.8 - 1.8 + 11 + 11 diff --git a/auditlog/log-enricher/src/main/docker/Dockerfile.jvm b/auditlog/log-enricher/src/main/docker/Dockerfile.jvm index 4bb95f5e..4588e318 100644 --- a/auditlog/log-enricher/src/main/docker/Dockerfile.jvm +++ b/auditlog/log-enricher/src/main/docker/Dockerfile.jvm @@ -1,22 +1,94 @@ #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # -# Before building the docker image run: +# Before building the container image run: # -# mvn package +# ./mvnw package # # Then, build the image with: # -# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/auditing-log-enricher-jvm . +# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/my-artifactId-jvm . # # Then run the container using: # -# docker run -i --rm -p 8080:8080 quarkus/auditing-log-enricher-jvm +# docker run -i --rm -p 8080:8080 quarkus/my-artifactId-jvm +# +# If you want to include the debug port into your docker image +# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 +# +# Then run the container using : +# +# docker run -i --rm -p 8080:8080 quarkus/my-artifactId-jvm +# +# This image uses the `run-java.sh` script to run the application. +# This scripts computes the command line to execute your Java application, and +# includes memory/GC tuning. +# You can configure the behavior using the following environment properties: +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options +# in JAVA_OPTS (example: "-Dsome.property=foo") +# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is +# used to calculate a default maximal heap memory based on a containers restriction. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio +# of the container available memory as set here. The default is `50` which means 50% +# of the available memory is used as an upper boundary. You can skip this mechanism by +# setting this value to `0` in which case no `-Xmx` option is added. +# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This +# is used to calculate a default initial heap memory based on the maximum heap memory. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio +# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` +# is used as the initial heap size. You can skip this mechanism by setting this value +# to `0` in which case no `-Xms` option is added (example: "25") +# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. +# This is used to calculate the maximum value of the initial heap memory. If used in +# a container without any memory constraints for the container then this option has +# no effect. If there is a memory constraint then `-Xms` is limited to the value set +# here. The default is 4096MB which means the calculated value of `-Xms` never will +# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") +# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output +# when things are happening. This option, if set to true, will set +# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). +# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: +# true"). +# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). +# - CONTAINER_CORE_LIMIT: A calculated core limit as described in +# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") +# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). +# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. +# (example: "20") +# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. +# (example: "40") +# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. +# (example: "4") +# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus +# previous GC times. (example: "90") +# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") +# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") +# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should +# contain the necessary JRE command-line options to specify the required GC, which +# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). +# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") +# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") +# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be +# accessed directly. (example: "foo.example.com,bar.example.com") # ### -FROM fabric8/java-centos-openjdk8-jdk -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV AB_ENABLED=jmx_exporter -COPY target/lib/* /deployments/lib/ -COPY target/*-runner.jar /deployments/app.jar -ENTRYPOINT [ "/deployments/run-java.sh" ] \ No newline at end of file +FROM registry.access.redhat.com/ubi8/openjdk-11:1.11 + +ENV LANGUAGE='en_US:en' + + +# We make four distinct layers so if there are application changes the library layers can be re-used +COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ +COPY --chown=185 target/quarkus-app/*.jar /deployments/ +COPY --chown=185 target/quarkus-app/app/ /deployments/app/ +COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ + +EXPOSE 8080 +USER 185 +ENV AB_JOLOKIA_OFF="" +ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" + diff --git a/auditlog/log-enricher/src/main/docker/Dockerfile.native b/auditlog/log-enricher/src/main/docker/Dockerfile.native index 68474bdf..0c93de69 100644 --- a/auditlog/log-enricher/src/main/docker/Dockerfile.native +++ b/auditlog/log-enricher/src/main/docker/Dockerfile.native @@ -1,22 +1,27 @@ #### -# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode +# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # -# Before building the docker image run: +# Before building the container image run: # -# mvn package -Pnative -Dnative-image.docker-build=true +# ./mvnw package -Pnative # # Then, build the image with: # -# docker build -f src/main/docker/Dockerfile.native -t quarkus/auditing-log-enricher . +# docker build -f src/main/docker/Dockerfile.native -t quarkus/my-artifactId . # # Then run the container using: # -# docker run -i --rm -p 8080:8080 quarkus/auditing-log-enricher +# docker run -i --rm -p 8080:8080 quarkus/my-artifactId # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 WORKDIR /work/ -COPY target/*-runner /work/application -RUN chmod 775 /work +RUN chown 1001 /work \ + && chmod "g+rwX" /work \ + && chown 1001:root /work +COPY --chown=1001:root target/*-runner /work/application + EXPOSE 8080 -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] \ No newline at end of file +USER 1001 + +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] diff --git a/auditlog/register-postgres.json b/auditlog/register-postgres.json index d56ab633..f59e7be9 100644 --- a/auditlog/register-postgres.json +++ b/auditlog/register-postgres.json @@ -6,6 +6,6 @@ "database.user": "postgresuser", "database.password": "postgrespw", "database.dbname" : "vegetablesdb", - "database.server.name": "dbserver1", + "topic.prefix": "dbserver1", "table.include.list": "inventory.vegetable,inventory.transaction_context_data" } diff --git a/auditlog/vegetables-service/pom.xml b/auditlog/vegetables-service/pom.xml index 8e64ffc3..88225a76 100644 --- a/auditlog/vegetables-service/pom.xml +++ b/auditlog/vegetables-service/pom.xml @@ -8,10 +8,10 @@ UTF-8 2.22.0 - 1.4.2.Final + 2.11.0.Final UTF-8 - 1.8 - 1.8 + 11 + 11 diff --git a/auditlog/vegetables-service/src/main/docker/Dockerfile.jvm b/auditlog/vegetables-service/src/main/docker/Dockerfile.jvm index 83354189..4588e318 100644 --- a/auditlog/vegetables-service/src/main/docker/Dockerfile.jvm +++ b/auditlog/vegetables-service/src/main/docker/Dockerfile.jvm @@ -1,23 +1,94 @@ #### # This Dockerfile is used in order to build a container that runs the Quarkus application in JVM mode # -# Before building the docker image run: +# Before building the container image run: # -# mvn package +# ./mvnw package # # Then, build the image with: # -# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/debezium-auditing-demo-jvm . +# docker build -f src/main/docker/Dockerfile.jvm -t quarkus/my-artifactId-jvm . # # Then run the container using: # -# docker run -i --rm -p 8080:8080 quarkus/debezium-auditing-demo-jvm +# docker run -i --rm -p 8080:8080 quarkus/my-artifactId-jvm +# +# If you want to include the debug port into your docker image +# you will have to expose the debug port (default 5005) like this : EXPOSE 8080 5005 +# +# Then run the container using : +# +# docker run -i --rm -p 8080:8080 quarkus/my-artifactId-jvm +# +# This image uses the `run-java.sh` script to run the application. +# This scripts computes the command line to execute your Java application, and +# includes memory/GC tuning. +# You can configure the behavior using the following environment properties: +# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") +# - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options +# in JAVA_OPTS (example: "-Dsome.property=foo") +# - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is +# used to calculate a default maximal heap memory based on a containers restriction. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xmx` is set to a ratio +# of the container available memory as set here. The default is `50` which means 50% +# of the available memory is used as an upper boundary. You can skip this mechanism by +# setting this value to `0` in which case no `-Xmx` option is added. +# - JAVA_INITIAL_MEM_RATIO: Is used when no `-Xms` option is given in JAVA_OPTS. This +# is used to calculate a default initial heap memory based on the maximum heap memory. +# If used in a container without any memory constraints for the container then this +# option has no effect. If there is a memory constraint then `-Xms` is set to a ratio +# of the `-Xmx` memory as set here. The default is `25` which means 25% of the `-Xmx` +# is used as the initial heap size. You can skip this mechanism by setting this value +# to `0` in which case no `-Xms` option is added (example: "25") +# - JAVA_MAX_INITIAL_MEM: Is used when no `-Xms` option is given in JAVA_OPTS. +# This is used to calculate the maximum value of the initial heap memory. If used in +# a container without any memory constraints for the container then this option has +# no effect. If there is a memory constraint then `-Xms` is limited to the value set +# here. The default is 4096MB which means the calculated value of `-Xms` never will +# be greater than 4096MB. The value of this variable is expressed in MB (example: "4096") +# - JAVA_DIAGNOSTICS: Set this to get some diagnostics information to standard output +# when things are happening. This option, if set to true, will set +# `-XX:+UnlockDiagnosticVMOptions`. Disabled by default (example: "true"). +# - JAVA_DEBUG: If set remote debugging will be switched on. Disabled by default (example: +# true"). +# - JAVA_DEBUG_PORT: Port used for remote debugging. Defaults to 5005 (example: "8787"). +# - CONTAINER_CORE_LIMIT: A calculated core limit as described in +# https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt. (example: "2") +# - CONTAINER_MAX_MEMORY: Memory limit given to the container (example: "1024"). +# - GC_MIN_HEAP_FREE_RATIO: Minimum percentage of heap free after GC to avoid expansion. +# (example: "20") +# - GC_MAX_HEAP_FREE_RATIO: Maximum percentage of heap free after GC to avoid shrinking. +# (example: "40") +# - GC_TIME_RATIO: Specifies the ratio of the time spent outside the garbage collection. +# (example: "4") +# - GC_ADAPTIVE_SIZE_POLICY_WEIGHT: The weighting given to the current GC time versus +# previous GC times. (example: "90") +# - GC_METASPACE_SIZE: The initial metaspace size. (example: "20") +# - GC_MAX_METASPACE_SIZE: The maximum metaspace size. (example: "100") +# - GC_CONTAINER_OPTIONS: Specify Java GC to use. The value of this variable should +# contain the necessary JRE command-line options to specify the required GC, which +# will override the default of `-XX:+UseParallelGC` (example: -XX:+UseG1GC). +# - HTTPS_PROXY: The location of the https proxy. (example: "myuser@127.0.0.1:8080") +# - HTTP_PROXY: The location of the http proxy. (example: "myuser@127.0.0.1:8080") +# - NO_PROXY: A comma separated lists of hosts, IP addresses or domains that can be +# accessed directly. (example: "foo.example.com,bar.example.com") # ### -# FROM fabric8/java-alpine-openjdk8-jre -FROM fabric8/java-centos-openjdk8-jdk -ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" -ENV AB_ENABLED=jmx_exporter -COPY target/lib/* /deployments/lib/ -COPY target/*-runner.jar /deployments/app.jar -ENTRYPOINT [ "/deployments/run-java.sh" ] \ No newline at end of file +FROM registry.access.redhat.com/ubi8/openjdk-11:1.11 + +ENV LANGUAGE='en_US:en' + + +# We make four distinct layers so if there are application changes the library layers can be re-used +COPY --chown=185 target/quarkus-app/lib/ /deployments/lib/ +COPY --chown=185 target/quarkus-app/*.jar /deployments/ +COPY --chown=185 target/quarkus-app/app/ /deployments/app/ +COPY --chown=185 target/quarkus-app/quarkus/ /deployments/quarkus/ + +EXPOSE 8080 +USER 185 +ENV AB_JOLOKIA_OFF="" +ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager" +ENV JAVA_APP_JAR="/deployments/quarkus-run.jar" + diff --git a/auditlog/vegetables-service/src/main/docker/Dockerfile.native b/auditlog/vegetables-service/src/main/docker/Dockerfile.native index 4caf3be3..0c93de69 100644 --- a/auditlog/vegetables-service/src/main/docker/Dockerfile.native +++ b/auditlog/vegetables-service/src/main/docker/Dockerfile.native @@ -1,22 +1,27 @@ #### -# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode +# This Dockerfile is used in order to build a container that runs the Quarkus application in native (no JVM) mode. # -# Before building the docker image run: +# Before building the container image run: # -# mvn package -Pnative -Dnative-image.docker-build=true +# ./mvnw package -Pnative # # Then, build the image with: # -# docker build -f src/main/docker/Dockerfile.native -t quarkus/debezium-auditing-demo . +# docker build -f src/main/docker/Dockerfile.native -t quarkus/my-artifactId . # # Then run the container using: # -# docker run -i --rm -p 8080:8080 quarkus/debezium-auditing-demo +# docker run -i --rm -p 8080:8080 quarkus/my-artifactId # ### -FROM registry.access.redhat.com/ubi8/ubi-minimal +FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 WORKDIR /work/ -COPY target/*-runner /work/application -RUN chmod 775 /work +RUN chown 1001 /work \ + && chmod "g+rwX" /work \ + && chown 1001:root /work +COPY --chown=1001:root target/*-runner /work/application + EXPOSE 8080 -CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] \ No newline at end of file +USER 1001 + +CMD ["./application", "-Dquarkus.http.host=0.0.0.0"] diff --git a/auditlog/vegetables-service/src/main/resources/application.properties b/auditlog/vegetables-service/src/main/resources/application.properties index 0703c7bc..2ff7b414 100644 --- a/auditlog/vegetables-service/src/main/resources/application.properties +++ b/auditlog/vegetables-service/src/main/resources/application.properties @@ -1,8 +1,8 @@ mp.jwt.verify.issuer=farmshop mp.jwt.verify.publickey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjYWJ6Zt9Jo9dxVuMglo0rYN4vBV0T7AP+qD/aI7tTrus6ZMvTi/+JKlNpEAS0b6yasYjxuKmh3eYT0PbGmGERr07VDsVcV/iezl9pj+fceY4lebrExS36yGQJs6BUXYF4P8ynmvnKC40AuyxKFgb3T08h1jxoBsBKlPfAT620ZP1vwgGwZB7iAfzdNYtt3z2NtkyPMaD1mHU6rxewjVN9XVSSSPKO8nFPTYsm1i4ePohgWr9bxwFHkXzyk7DnpUBMZzlVUUXVPuEpkVCqnWZTslMw/pgsyXPw1pmV76rVwhI0Ay4XohPW2QvDoPKHhuiQtcNrfL++iEFG8A9hh1K3QIDAQAB -quarkus.datasource.url=jdbc:postgresql://localhost:5432/vegetablesdb?currentSchema=inventory -quarkus.datasource.driver=org.postgresql.Driver +quarkus.datasource.db-kind=postgresql +quarkus.datasource.jdbc.url=jdbc:postgresql://vegetables-db:5432/vegetablesdb?currentSchema=inventory quarkus.datasource.username=postgresuser quarkus.datasource.password=postgrespw quarkus.datasource.max-size=8