Build project in container and improve compose

Author: anderslindho

.github/workflows/docker-release.yml

@@ -1,4 +1,3 @@
-
 name: Release docker image
 
 on:
@@ -19,14 +18,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: maven
-      - name: Build with Maven
-        run: mvn --batch-mode --update-snapshots package
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:

Dockerfile

@@ -1,6 +1,12 @@
-FROM eclipse-temurin:17-jre
+# syntax=docker/dockerfile:1
 
-# deployment unit
-COPY target/ChannelFinder-*.jar /channelfinder/ChannelFinder-*.jar
+FROM eclipse-temurin:17-jdk AS builder
+WORKDIR /build
+RUN apt-get update && apt-get install -y maven
+COPY . .
+RUN mvn --batch-mode --update-snapshots clean package -DskipTests
 
-CMD ["java", "-jar", "/channelfinder/ChannelFinder-*.jar", "--spring.config.name=application"]
+FROM eclipse-temurin:17-jre AS runner
+WORKDIR /app
+COPY --from=builder /build/target/ChannelFinder-*.jar ./channelfinder.jar
+CMD ["java", "-jar", "/app/channelfinder.jar", "--spring.config.name=application"]

compose.yml

@@ -7,21 +7,15 @@ services:
       - channelfinder-net
     ports:
       - "8443:8443"
-    depends_on:
-      - elasticsearch
     environment:
-      - ELASTICSEARCH_NETWORK_HOST=elasticsearch-cf
-    command: >
-      /bin/bash -c "
-        until curl --silent --fail http://elasticsearch-cf:9200/_cluster/health; do
-          echo 'Waiting for Elasticsearch'
-          sleep 1
-        done
-        java -jar /channelfinder/ChannelFinder-*.jar"
+      - ELASTICSEARCH_NETWORK_HOST=elasticsearch
+    depends_on:
+      elasticsearch:
+        condition: service_healthy
 
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.11.2
-    hostname: elasticsearch-cf
+    hostname: elasticsearch
     networks:
       - channelfinder-net
     ports:
@@ -34,6 +28,11 @@ services:
       EPICS_PVAS_INTF_ADDR_LIST: "0.0.0.0"
     volumes:
       - channelfinder-es-data:/usr/share/elasticsearch/data
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:9200/_cluster/health"]
+      interval: 10s
+      timeout: 5s
+      retries: 3
 volumes:
   channelfinder-es-data:
     driver: local