Merge branch 'main' into standardise-pact

Author: duncancrawford

.env

@@ -1,2 +1,4 @@
 SERVER_PORT=4550
-BASE_IMAGE=openjdk:21-jdk-slim
+BASE_IMAGE=openjdk:21-jdk-slim
+JAR_FILENAME=service-cp-crime-schedulingandlisting-courtschedule-*.jar
+JAR_FILE_PATH=build/libs

.github/workflows/ci-build-publish.yml

@@ -93,7 +93,7 @@ jobs:
       - name: Upload JAR Artefact
         uses: actions/upload-artifact@v4
         with:
-          name: app-jar
+          name: app.jar
           path: build/libs/${{ steps.repo_vars.outputs.artefact_name }}.jar
 
   Provider-Deploy:
@@ -186,7 +186,7 @@ jobs:
       - name: Download JAR Artefact
         uses: actions/download-artifact@v4
         with:
-          name: app-jar
+          name: app.jar
           path: build/libs
 
       - name: Set up Docker Buildx

Dockerfile

@@ -3,20 +3,30 @@ ARG BASE_IMAGE
 FROM ${BASE_IMAGE:-openjdk:21-jdk-slim}
 
 # ---- Runtime arguments ----
-ARG JAR_FILENAME=app.jar
+ARG JAR_FILENAME
+ARG JAR_FILE_PATH
+
+ENV JAR_FILENAME=${JAR_FILENAME:-app.jar}
+ENV JAR_FILE_PATH=${JAR_FILE_PATH:-build/libs}
+ENV JAR_FULL_PATH=$JAR_FILE_PATH/$JAR_FILENAME
+
+# ---- Set runtime ENV for Spring Boot to bind port
+ARG SERVER_PORT
+ENV SERVER_PORT=${SERVER_PORT:-4550}
 
 # ---- Dependencies ----
 RUN apt-get update \
     && apt-get install -y curl \
     && rm -rf /var/lib/apt/lists/*
 
 # ---- Application files ----
-COPY build/libs/${JAR_FILENAME} /opt/app/${JAR_FILENAME}
+COPY $JAR_FULL_PATH /opt/app/app.jar
 COPY lib/applicationinsights.json /opt/app/
 
 # ---- Permissions ----
-RUN chmod 755 /opt/app/$JAR_FILENAME
+RUN chmod 755 /opt/app/app.jar
 
 # ---- Runtime ----
 EXPOSE 4550
-CMD ["java", "-jar", "/opt/app/$JAR_FILENAME"]
+
+CMD ["java", "-jar", "/opt/app/app.jar"]

docker-compose.yml

@@ -1,7 +1,9 @@
-version: '2.1'
+version: '3.8'
 
 services:
-  service-cp-refdata-courthearing-judges:
+  service-cp-crime-schedulingandlisting-courtschedule:
+    env_file:
+      - .env
     build:
       context: .
       dockerfile: Dockerfile
@@ -10,11 +12,22 @@ services:
         https_proxy: ${https_proxy}
         no_proxy: ${no_proxy}
         BASE_IMAGE: ${BASE_IMAGE}
+        SERVER_PORT: ${SERVER_PORT}
+        JAR_FILENAME: ${JAR_FILENAME}
+        JAR_FILE_PATH: ${JAR_FILE_PATH}
+    environment:
+      - SERVER_PORT=${SERVER_PORT:-4550}
     ports:
-      - $SERVER_PORT:$SERVER_PORT
+      - "${SERVER_PORT:-4550}:${SERVER_PORT:-4550}"
+    networks:
+      - service-network
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:${SERVER_PORT}/health" ]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 5s
+
+networks:
+  service-network:
+    name: service-cp-crime-schedulingandlisting-courtschedule-network