chore: fixup dockerfile and docker-compose

Author: coling01

Dockerfile

@@ -19,15 +19,14 @@ apply {
   from("$rootDir/gradle/dependencies/spring-core.gradle")
   from("$rootDir/gradle/dependencies/spring-db.gradle")
 
-  from("$rootDir/gradle/tasks/apitest.gradle")
-
   from("$rootDir/gradle/github/repositories.gradle")
   from("$rootDir/gradle/github/java.gradle")
   from("$rootDir/gradle/github/dependency.gradle")
   from("$rootDir/gradle/github/pmd.gradle")
   from("$rootDir/gradle/github/test.gradle")
   from("$rootDir/gradle/github/jar.gradle")
-  from("$rootDir/gradle/github/docker.gradle")
+
+  from("$rootDir/gradle/tasks/api-test.gradle")
 }
 
 springBoot {

build.gradle

@@ -0,0 +1,20 @@
+# Dockerfile (project root)
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-eclipse-temurin:25-jre}
+
+# install curl for debugging
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# run as non-root
+RUN groupadd -r app && useradd -r -g app app
+WORKDIR /app
+
+# copy startup script and app jar file
+COPY docker/* /app/
+COPY build/libs/*.jar /app/
+COPY ../lib/applicationinsights.json /app/
+
+USER app
+ENTRYPOINT ["/bin/sh","./startup.sh"]

docker-compose.yml

@@ -0,0 +1,23 @@
+services:
+  db:
+    image: postgres:18-alpine
+    environment:
+      POSTGRES_DB: template-db # use specific name to reduce flyway conflicts
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+    ports:
+      - "5432:5432"
+
+  app:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
+    depends_on:
+      - db
+    environment:
+      APP_NAME_DATASOURCE_URL: jdbc:postgresql://db:5432/template-db
+      APP_NAME_DATASOURCE_USERNAME: postgres
+      APP_NAME_DATASOURCE_PASSWORD: postgres
+    ports:
+      - "8082:8082"
+

docker/Dockerfile

@@ -0,0 +1,21 @@
+#!/usr/bin/env sh
+# Script to perform any custom docker startup actions
+# Allows local running where the jarfile is under ./build/lib
+# or dockerfile running where the app jarfile is under /app
+#
+logmsg() {
+    SCRIPTNAME=$(basename $0)
+    echo "$SCRIPTNAME : $1"
+}
+
+export LOCALJARFILE=$(ls ./build/libs/*.jar 2>/dev/null | grep -v 'plain' | head -n1)
+export DOCKERJARFILE=$(ls /app/*.jar 2>/dev/null | grep -v 'plain' | head -n1)
+if [ -f "$DOCKERJARFILE" ]; then
+    logmsg "Running docker java jarfile $DOCKERJARFILE"
+    java -jar $DOCKERJARFILE
+elif [ -f "$LOCALJARFILE" ]; then
+    logmsg "Running local java jarfile $LOCALJARFILE"
+    java -jar $LOCALJARFILE
+else
+    logmsg "ERROR - No jarfile found. Unable to start application"
+fi

docker/docker-compose.yml

@@ -1,19 +1,6 @@
 jar {
-  enabled = true
-  archiveClassifier.set('plain')
-  manifest {
-    attributes(
-      'Implementation-Title': project.name,
-      'Implementation-Version': project.version.toString()
-    )
-  }
-  if (file("CHANGELOG.md").exists()) {
-    from('CHANGELOG.md') {
-      into 'META-INF'
-    }
-  } else {
-    println "⚠️  CHANGELOG.md not found, skipping inclusion in JAR"
-  }
+  // we dont need jar task which just creates *-plain.jar
+  enabled = false
 }
 
 bootJar {