better modularization

Author: markusMM

.github/workflows/build.yml

@@ -13,41 +13,30 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-      - name: Build Spring Boot
-        working-directory: ./backend
-        run: mvn clean package
-      - name: Run backend unit tests
-        working-directory: ./backend
-        run: mvn test
       - name: Docker build backend
-        run: docker build -t my-backend ./backend
-
+        run: docker build -t clahe-backend ./backend
 
   build-frontend:
     runs-on: ubuntu-latest
     needs: build-backend
     steps:
-      - uses: actions/checkout@v3
-      - name: Node.js setup
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20'
-      - name: Install dependencies and build
-        working-directory: ./frontend
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      # Optional: log in to a container registry if you want to push images
+      # - name: Log in to Docker Hub
+      #   uses: docker/login-action@v3
+      #   with:
+      #     username: ${{ secrets.DOCKER_USERNAME }}
+      #     password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build frontend Docker image
+        run: docker build -t clahe-frontend ./frontend
+      # test the build
+      - name: Run container smoke test
         run: |
-          npm install
-          npm run build
-      - name: Run frontend unit tests
-        working-directory: ./frontend
-        run: npm test -- --watchAll=false
-      - name: Docker build frontend
-        run: docker build -t my-frontend ./frontend
-
+          docker run --rm -p 8080:80 clahe-frontend curl -I http://localhost:8080
+      # Optional: push to registry for later deployment
+      # - name: Push image to Docker Hub
+      #   run: docker push clahe-frontend
 
   approve-release:
     needs: [build-backend, build-frontend]
@@ -58,7 +47,6 @@ jobs:
           approvers: ""
           minimum-approvals: 1
 
-
   release:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
@@ -71,7 +59,6 @@ jobs:
           name: "Release ${{ github.ref_name }}"
           body: "Automated release from CI/CD workflow."
 
-
   infra-plan:
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest

backend/Dockerfile

@@ -1,10 +1,17 @@
-# backend/Dockerfile
-FROM openjdk:17-jdk-alpine
+FROM maven:3.9-eclipse-temurin-17 AS test
 WORKDIR /app
+COPY pom.xml .
+COPY src ./src
+RUN mvn test
 
-# Copy the built JAR file into the container
-COPY target/clahe-backend-1.0.0.jar app.jar
+FROM maven:3.9-eclipse-temurin-17 AS build
+WORKDIR /app
+COPY pom.xml .
+COPY src ./src
+RUN mvn clean package -DskipTests
 
-# Run it
-ENTRYPOINT ["java", "-jar", "/app/app.jar"]
+FROM eclipse-temurin:17-jre-alpine
+WORKDIR /app
+COPY --from=build /app/target/*.jar app.jar
 EXPOSE 8080
+ENTRYPOINT ["java", "-jar", "app.jar"]

frontend/.dockerignore

@@ -0,0 +1,6 @@
+node_modules
+.git
+.gitignore
+Dockerfile
+npm-debug.log
+README*