NoIssue: Fix for build, run and publish

build.gradle.kts

@@ -49,20 +49,25 @@ tasks.withType<JavaCompile>().configureEach {
     options.release.set(25)
 }
 
-val dockerLibsDir = layout.buildDirectory.dir("docker/libs")
+val libsDir = layout.buildDirectory.dir("libs")
 
-tasks.register<Sync>("prepareDockerLibs") {
+tasks.register<Sync>("prepareLibs") {
     group = "distribution"
-    description = "Copies all runtime dependencies (transitive) to build/docker/libs"
+    description = "Copies runtime deps to build/libs without deleting the app jar"
 
-    // Hvis du også vil bygge dit eget jar samtidig, så lad den stå – ellers kan du fjerne den.
-    dependsOn(tasks.named("jar"))
+    val jarTask = tasks.named<Jar>("jar")
+    dependsOn(jarTask)
 
-    into(dockerLibsDir)
+    into(libsDir)
 
     // Kun deps (transitivt)
     from(configurations.runtimeClasspath)
 
+    // Bevar jar-filen som jar-tasken allerede har lagt i build/libs
+    preserve {
+        include(jarTask.get().archiveFileName.get())
+    }
+
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 

build.sh

@@ -13,13 +13,14 @@ export VERSION_LONG=${VERSION}_${GITHASH}
 
 # Build this artifact
 echo "Building 'NenjimHub v${VERSION_LONG}'..."
-./gradlew -Pversion=$VERSION jar prepareDockerLibs
+./gradlew -Pversion=$VERSION jar prepareLibs
+
 # Prepare container dependencies
-mkdir -p build/docker/conf
+mkdir -p build/docker/{conf,libs}
 cd build/docker
-cp ../../src/main/docker/start.sh start.sh
-cp ../libs/hubd-impl-ref-*.jar libs
-cp ../../conf/* conf
+cp ../../src/main/docker/run.sh run.sh
+cp ../libs/*.jar libs/
+cp ../../conf/* conf/
 sed -e "s|_VERSION_|${VERSION}|g" \
     -e "s|_JREVERSION_|${JREVERSION}|g" \
     ../../src/main/docker/Dockerfile_template > Dockerfile

libs

@@ -0,0 +1 @@
+build/libs

publishCICD.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-export VERSION=$(git describe --tags --exact-match 2>/dev/null \
-  || git symbolic-ref --short -q HEAD \
-  || git rev-parse --short HEAD)
-
-echo "Publishing artifact ($VERSION)..."
-./gradlew -Pversion=$VERSION publish
-
-echo "Publishing docker container ($VERSION)..."
-./build/docker/publish.sh

publishCICD.sh

@@ -0,0 +1 @@
+publish.sh

run.sh

@@ -1,6 +1,17 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-./gradlew run \
-  -Dlog4j.configurationFile="$PWD/config/log4j2.xml" \
-   --args="foo bar baz"
+shopt -s nullglob
+
+jars=(libs/*.jar)
+if (( ${#jars[@]} == 0 )); then
+  echo "ERROR: No JARs found in libs/" >&2
+  exit 1
+fi
+
+CLASSPATH=$(IFS=:; echo "${jars[*]}")
+
+exec java \
+  -Dlog4j.configurationFile=conf/log4j2.xml \
+  -cp "$CLASSPATH" \
+  com.r35157.nenjim.hubd.impl.ref.Main

src/main/docker/Dockerfile_template

@@ -13,7 +13,7 @@ WORKDIR nenjimhub
 RUN mkdir libs
 
 # These dirs are expected to be overshadowed by host mounts
-RUN mkdir conf logs
+RUN mkdir conf logs && chown user:user logs
 
 # Set timezone
 ENV TZ=Europe/Copenhagen
@@ -29,14 +29,14 @@ RUN apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Install application and configuration (Do this as late as possible to be able to reuse layers between builds)
-COPY start.sh .
+COPY run.sh .
 COPY conf/* conf/
 COPY libs/*.jar libs/
 
-RUN chmod 755 ./start.sh \
+RUN chmod 755 ./run.sh \
     && chmod -R a+rX /usr/local/software/nenjimhub-_VERSION_
 
 USER user:user
 
-CMD ["./start.sh"]
+CMD ["./run.sh"]