AMP-135 - addressed merge conflicts.

Author: madhusudan-yasa

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

@@ -144,17 +144,17 @@ jobs:
           path: build/libs
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: setup-buildx-action@v3
 
       - name: Log in to GitHub Packages
-        uses: docker/login-action@v3
+        uses: login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and Push Docker Image to GitHub
-        uses: docker/build-push-action@v6
+        uses: build-push-action@v6
         with:
           context: .
           file: Dockerfile

.github/workflows/codeql.yml

@@ -92,11 +92,11 @@ jobs:
         run: gradle build -x test -x api
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: setup-buildx-action@v3
 
       - name: DAST - Build and run containerised app
         run: |
-          docker compose -f docker/docker-compose.api.yml up -d
+          docker compose -f docker-compose.yml up -d
           
           echo "Waiting for health endpoint..."
           for i in {1..30}; do

Dockerfile

@@ -1,4 +1,22 @@
-FROM eclipse-temurin:21
-WORKDIR /opt/app
-COPY build/libs/*.jar /opt/app/app.jar
-CMD ["java", "-jar", "/opt/app/app.jar"]
+# Dockerfile (project root)
+FROM eclipse-temurin:21-jre-alpine
+
+# minimal runtime tooling for healthcheck
+RUN apk add --no-cache curl
+
+# run as non-root
+RUN addgroup -S app && adduser -S app -G app
+WORKDIR /app
+
+# copy all jars (bootJar + plain). We'll run the non-plain jar.
+COPY build/libs/*.jar /app/
+
+EXPOSE ${SERVER_PORT:-8082}
+ENV JAVA_OPTS="-XX:MaxRAMPercentage=75 -XX:+AlwaysActAsServerClassMachine"
+
+HEALTHCHECK --interval=10s --timeout=3s --start-period=20s --retries=15 \
+  CMD curl -fsS http://localhost:${SERVER_PORT:-8082}/actuator/health | grep -q '"status":"UP"' || exit 1
+
+USER app
+# pick the Boot fat jar (exclude '-plain.jar')
+ENTRYPOINT ["sh","-c","exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar $(ls /app/*.jar | grep -v 'plain' | head -n1)"]

docker-compose.yml

@@ -1,7 +1,6 @@
-version: '3.9'
-
 services:
-  postgres:
+  db:
+    container_name: db
     image: postgres:16-alpine
     environment:
       POSTGRES_DB: postgres
@@ -15,15 +14,18 @@ services:
       timeout: 5s
       retries: 5
 
-  service-hmcts-marketplace-springboot-template:
-    env_file:
-      - local.env
+  app:
+    container_name: app
     build:
       context: .
       dockerfile: Dockerfile
     depends_on:
-      postgres:
+      db:
         condition: service_healthy
+    environment:
+      APP_NAME_DATASOURCE_URL: jdbc:postgresql://db:5432/postgres
+      APP_NAME_DATASOURCE_USERNAME: postgres
+      APP_NAME_DATASOURCE_PASSWORD: postgres
     ports:
       - "8082:8082"
 

docker/Dockerfile

@@ -57,7 +57,7 @@ sequenceDiagram
 
     note right of GH: All assurance workflow steps are complete
     GH->>Art: Publish artefact [DRAFT] (versioned via git tag & commit SHA)
-    note right of GH: The build and publish of the image is one step via the<br/>custom action "docker/build-push-action" but is represented<br/>here as two steps for readability
+    note right of GH: The build and publish of the image is one step via the<br/>custom action "build-push-action" but is represented<br/>here as two steps for readability
     GH->>GH: Build Docker image (versioned via git tag & commit SHA)
     GH->>ACR: Publish container
 ```

docker/docker-compose.api.yml

@@ -1,5 +1,5 @@
 dockerCompose {
-  useComposeFiles = ['docker/docker-compose.api.yml']
+  useComposeFiles = ['docker-compose.yml']
   startedServices = ['app', 'db']
 
   buildBeforeUp = true

docs/PIPELINE.md

@@ -2,7 +2,12 @@
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
 import static org.assertj.core.api.Assertions.assertThat;

gradle/github/docker.gradle

@@ -4,7 +4,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 import uk.gov.hmcts.cp.openapi.api.ExamplesApi;
 import uk.gov.hmcts.cp.openapi.model.ExampleResponse;
@@ -18,9 +17,10 @@ public class ExampleController implements ExamplesApi {
     private final ExampleService exampleService;
 
     @Override
-    public ResponseEntity<ExampleResponse> getExampleByExampleId(@PathVariable("example_id") @NotNull final Long exampleId) {
+    public ResponseEntity<ExampleResponse> getExampleByExampleId(@NotNull final Long exampleId) {
 
         log.info("getExampleByExampleId example for {}", exampleId);
         return ResponseEntity.ok(exampleService.getExampleById(exampleId));
     }
+
 }