From 47d2af0d28be744b7f0cfcfb0fc0b1a3eb6dbf67 Mon Sep 17 00:00:00 2001 From: Nicholas Padilla Date: Tue, 2 Jun 2026 19:03:38 -0700 Subject: [PATCH 01/11] drop building docker image for now --- .github/workflows/gradle-build.yml | 12 ++--- ...inotic.java-application-conventions.gradle | 50 ++++++++----------- 2 files changed, 26 insertions(+), 36 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 3193b8a8..69149212 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -53,12 +53,12 @@ jobs: JRELEASER_GPG_SECRET_KEY: ${{ secrets.GPG_KEY_NEW }} JRELEASER_GPG_PASSPHRASE: ${{ secrets.GPG_KEY_PASS_NEW }} - - name: Publish to Docker Hub - if: ${{ steps.gradle_build.outcome == 'success' }} - run: ./gradlew bootBuildImage --publishImage - env: - DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} - DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} +# - name: Publish to Docker Hub +# if: ${{ steps.gradle_build.outcome == 'success' }} +# run: ./gradlew bootBuildImage --publishImage +# env: +# DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }} +# DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Run E2E Tests id: run_e2e_tests diff --git a/buildSrc/src/main/groovy/org.kinotic.java-application-conventions.gradle b/buildSrc/src/main/groovy/org.kinotic.java-application-conventions.gradle index 30ce840f..fa43a451 100644 --- a/buildSrc/src/main/groovy/org.kinotic.java-application-conventions.gradle +++ b/buildSrc/src/main/groovy/org.kinotic.java-application-conventions.gradle @@ -34,34 +34,24 @@ dependencies { // bootBuildImage task source https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/BootBuildImage.java // Paketo options here https://paketo.io/docs/howto/java/#configure-the-jvm-at-runtime // https://paketo.io/docs/reference/java-reference/ -bootBuildImage { - network = "host" - publish = System.getenv("GITHUB_ACTIONS") == "true" - imageName = "kinoticai/${project.name}:${project.version}" - tags = (!version.endsWith('SNAPSHOT') ? - [ - "kinoticai/${project.name}:latest" - ] - : []) - environment = [ - "BP_HEALTH_CHECKER_ENABLED": "true", - "THC_PATH": "/health", // Health check path for https://github.com/dmikusa/tiny-health-checker#usageor which is provided by the health-checker buildpack - "BPE_DELIM_JAVA_TOOL_OPTIONS" : " ", - "BPE_APPEND_JAVA_TOOL_OPTIONS": "-XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED", - ] - buildpacks = [ - "urn:cnb:builder:paketo-buildpacks/java", - "docker.io/paketobuildpacks/health-checker" // https://github.com/paketo-buildpacks/health-checker/tree/main - ] - // builder = "paketobuildpacks/ubuntu-noble-builder" - docker { - // Use standard Docker socket to avoid API version issues - // host = System.getenv("DOCKER_HOST") ?: "unix:///var/run/docker.sock" - - publishRegistry { - username = System.getenv("DOCKER_HUB_USERNAME") - password = System.getenv("DOCKER_HUB_PASSWORD") - } - } -} +//bootBuildImage { +// network = "host" +// publish = true +// imageName = "kinotic/${project.name}:${project.version}" +// tags = (!version.endsWith('SNAPSHOT') ? +// [ +// "kinotic/${project.name}:latest" +// ] +// : []) +// environment = [ +// "BPE_DELIM_JAVA_TOOL_OPTIONS" : " ", +// "BPE_APPEND_JAVA_TOOL_OPTIONS": "-XX:+UseG1GC -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/com.sun.jmx.mbeanserver=ALL-UNNAMED --add-opens=java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED" +// ] +// docker { +// publishRegistry { +// username = System.getenv("DOCKER_HUB_USERNAME") +// password = System.getenv("DOCKER_HUB_PASSWORD") +// } +// } +//} From 476fa24de9064d56f0530348ceaa8b4dc08293eb Mon Sep 17 00:00:00 2001 From: Nicholas Padilla Date: Tue, 2 Jun 2026 19:13:54 -0700 Subject: [PATCH 02/11] bump to next snapshot version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 77ea801f..81316c33 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -structuresVersion=3.5.2 +structuresVersion=3.5.3-SNAPSHOT allureVersion=2.32.0 antlrVersion=4.13.1 From ed98915e0383414af58ca44cef4485a48524a189 Mon Sep 17 00:00:00 2001 From: Nicholas Padilla Date: Tue, 2 Jun 2026 19:22:36 -0700 Subject: [PATCH 03/11] config file updates --- .run/StructuresServerApplication.run.xml | 11 +---------- docker-compose/compose.ek-stack.yml | 4 ++-- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.run/StructuresServerApplication.run.xml b/.run/StructuresServerApplication.run.xml index 73856823..dd80dfe9 100644 --- a/.run/StructuresServerApplication.run.xml +++ b/.run/StructuresServerApplication.run.xml @@ -2,16 +2,7 @@