From e7e83a49c4a92bacaed88aabed1e06f6efabb9fc Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 13:28:31 -0600 Subject: [PATCH 01/14] adjust build arg --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d30085c1..2ce54b99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ EXPOSE 8089 ARG JAR_NAME=uid2-admin ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash -ARG EXTRA_CONFIG +ARG EXTRA_CONFIG="" ENV JAR_NAME=${JAR_NAME} ENV JAR_VERSION=${JAR_VERSION} ENV IMAGE_VERSION=${IMAGE_VERSION} From c3fe7984e515d334a295e3437c8cc04147009a88 Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 14:24:44 -0600 Subject: [PATCH 02/14] update dependency versions --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 44638436..44a84660 100644 --- a/pom.xml +++ b/pom.xml @@ -15,9 +15,9 @@ com.uid2.admin.vertx.AdminVerticle 1.12.2 - 5.10.3 - 7.16.0 - 0.5.9 + 5.11.2 + 7.19.0 + 0.5.10 ${project.version} @@ -37,7 +37,7 @@ com.google.guava guava - 33.2.1-jre + 33.3.1-jre com.uid2 @@ -87,12 +87,12 @@ com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.17.2 + 2.18.0 ch.qos.logback logback-classic - 1.5.6 + 1.5.8 com.github.loki4j From 2aedc501e887e545dfb49ecfc18a02f916e409eb Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 14:47:03 -0600 Subject: [PATCH 03/14] add .dockerignore --- .dockerignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..e09bd953 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +!src/resources/localstack/kms/seed.yaml \ No newline at end of file From 9f781eb2642121cdf4d818665764a0d376e22e3e Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 14:53:43 -0600 Subject: [PATCH 04/14] test --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ce54b99..60aa4034 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ EXPOSE 8089 ARG JAR_NAME=uid2-admin ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash -ARG EXTRA_CONFIG="" ENV JAR_NAME=${JAR_NAME} ENV JAR_VERSION=${JAR_VERSION} ENV IMAGE_VERSION=${IMAGE_VERSION} @@ -15,7 +14,7 @@ ENV LOGBACK_CONF=${LOGBACK_CONF:-./conf/logback.xml} COPY ./target/${JAR_NAME}-${JAR_VERSION}-jar-with-dependencies.jar /app/${JAR_NAME}-${JAR_VERSION}.jar COPY ./target/${JAR_NAME}-${JAR_VERSION}-sources.jar /app -COPY ./conf/default-config.json ${EXTRA_CONFIG} /app/conf/ +COPY ./conf/default-config.json /app/conf/ COPY ./conf/*.xml /app/conf/ COPY ./webroot/ /app/webroot/ From a3aded863534ee5790310d3335758adbcab6fcf5 Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 14:57:23 -0600 Subject: [PATCH 05/14] test --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 60aa4034..00ba674d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,7 @@ FROM eclipse-temurin@sha256:8179ddc8a6c5ac9af935020628763b9a5a671e0914976715d2b6 WORKDIR /app EXPOSE 8089 +ARG EXTRA_CONFIG=" " ARG JAR_NAME=uid2-admin ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash @@ -14,7 +15,7 @@ ENV LOGBACK_CONF=${LOGBACK_CONF:-./conf/logback.xml} COPY ./target/${JAR_NAME}-${JAR_VERSION}-jar-with-dependencies.jar /app/${JAR_NAME}-${JAR_VERSION}.jar COPY ./target/${JAR_NAME}-${JAR_VERSION}-sources.jar /app -COPY ./conf/default-config.json /app/conf/ +COPY ./conf/default-config.json ${EXTRA_CONFIG} /app/conf/ COPY ./conf/*.xml /app/conf/ COPY ./webroot/ /app/webroot/ From 2485c051cdda8c9030e870cf19336a08f29c4ae5 Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:02:45 -0600 Subject: [PATCH 06/14] test --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00ba674d..db7fc854 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM eclipse-temurin@sha256:8179ddc8a6c5ac9af935020628763b9a5a671e0914976715d2b6 WORKDIR /app EXPOSE 8089 -ARG EXTRA_CONFIG=" " +ARG EXTRA_CONFIG_RENAMED=" " ARG JAR_NAME=uid2-admin ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash @@ -15,7 +15,7 @@ ENV LOGBACK_CONF=${LOGBACK_CONF:-./conf/logback.xml} COPY ./target/${JAR_NAME}-${JAR_VERSION}-jar-with-dependencies.jar /app/${JAR_NAME}-${JAR_VERSION}.jar COPY ./target/${JAR_NAME}-${JAR_VERSION}-sources.jar /app -COPY ./conf/default-config.json ${EXTRA_CONFIG} /app/conf/ +COPY ./conf/default-config.json "${EXTRA_CONFIG_RENAMED}" /app/conf/ COPY ./conf/*.xml /app/conf/ COPY ./webroot/ /app/webroot/ From 873a37710833b4318455f4ecab141e5296eb5b84 Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:07:16 -0600 Subject: [PATCH 07/14] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index db7fc854..557b5e7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ FROM eclipse-temurin@sha256:8179ddc8a6c5ac9af935020628763b9a5a671e0914976715d2b6 WORKDIR /app EXPOSE 8089 -ARG EXTRA_CONFIG_RENAMED=" " ARG JAR_NAME=uid2-admin +ARG EXTRA_CONFIG_RENAMED="" ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash ENV JAR_NAME=${JAR_NAME} From 8b5b4e9a7351ffe4d027bd83a37cc46409d0f48c Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:10:05 -0600 Subject: [PATCH 08/14] test --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 557b5e7b..460937fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app EXPOSE 8089 ARG JAR_NAME=uid2-admin -ARG EXTRA_CONFIG_RENAMED="" +ARG EXTRA_CONFIG_RENAMED ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash ENV JAR_NAME=${JAR_NAME} From 9e0331516216aeeee09d0683d12ec868d1aff0e9 Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:14:39 -0600 Subject: [PATCH 09/14] test --- .dockerignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index e09bd953..2227641c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1 @@ -!src/resources/localstack/kms/seed.yaml \ No newline at end of file +src/main/resources/localstack/kms/seed.yaml \ No newline at end of file From 610d30aa2bb946d03d79f2eede0bf6946f933f3a Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:17:52 -0600 Subject: [PATCH 10/14] test --- .dockerignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 2227641c..758c63fa 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1 @@ -src/main/resources/localstack/kms/seed.yaml \ No newline at end of file +target/classes/localstack/kms/seed.yaml \ No newline at end of file From fa57e3fa0b35a8837490a6fce397ba388278b90e Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:22:54 -0600 Subject: [PATCH 11/14] test --- .dockerignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 758c63fa..811eedf0 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,2 @@ -target/classes/localstack/kms/seed.yaml \ No newline at end of file +src/main/resources/localstack/kms/seed.yaml +target/classes/localstack/kms/seed.yaml From 4dc53b98ad02d82e0cc57cf17422730cc06f3496 Mon Sep 17 00:00:00 2001 From: Release Workflow Date: Mon, 7 Oct 2024 21:25:07 +0000 Subject: [PATCH 12/14] [CI Pipeline] Released Snapshot version: 5.15.1-alpha-90-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44a84660..35ebf024 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-admin - 5.15.0 + 5.15.1-alpha-90-SNAPSHOT UTF-8 From c93515031608212e5978f09736507a17606daad8 Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:39:21 -0600 Subject: [PATCH 13/14] test --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 460937fb..1cdec685 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app EXPOSE 8089 ARG JAR_NAME=uid2-admin -ARG EXTRA_CONFIG_RENAMED +ARG EXTRA_CONFIG ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash ENV JAR_NAME=${JAR_NAME} @@ -15,7 +15,7 @@ ENV LOGBACK_CONF=${LOGBACK_CONF:-./conf/logback.xml} COPY ./target/${JAR_NAME}-${JAR_VERSION}-jar-with-dependencies.jar /app/${JAR_NAME}-${JAR_VERSION}.jar COPY ./target/${JAR_NAME}-${JAR_VERSION}-sources.jar /app -COPY ./conf/default-config.json "${EXTRA_CONFIG_RENAMED}" /app/conf/ +COPY ./conf/default-config.json ${EXTRA_CONFIG} /app/conf/ COPY ./conf/*.xml /app/conf/ COPY ./webroot/ /app/webroot/ From 0ea37d733d39ff335d1b6c562ea5de400821f35e Mon Sep 17 00:00:00 2001 From: "ian.nara" Date: Mon, 7 Oct 2024 15:40:12 -0600 Subject: [PATCH 14/14] test --- Dockerfile | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1cdec685..d30085c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,9 @@ WORKDIR /app EXPOSE 8089 ARG JAR_NAME=uid2-admin -ARG EXTRA_CONFIG ARG JAR_VERSION=1.0.0-SNAPSHOT ARG IMAGE_VERSION=1.0.0.unknownhash +ARG EXTRA_CONFIG ENV JAR_NAME=${JAR_NAME} ENV JAR_VERSION=${JAR_VERSION} ENV IMAGE_VERSION=${IMAGE_VERSION} diff --git a/pom.xml b/pom.xml index 35ebf024..44a84660 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.uid2 uid2-admin - 5.15.1-alpha-90-SNAPSHOT + 5.15.0 UTF-8