OZ-684: Fix docker build and publish GA workflow

ozone-his · Sep 30, 2024 · 462e080 · 462e080
1 parent 804a497
commit 462e080
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,15 +27,22 @@ jobs:
     if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
     needs: spotless
     uses: mekomsolutions/shared-github-workflow/.github/workflows/maven-publish.yml@main
+    with:
+      artifact-name: "fhir-odoo"
+      artifact-path: "fhir-odoo-app/target/*.jar"
+      upload-artifacts: true
     secrets:
       NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
       NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
 
   docker-publish:
     if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
-    needs: spotless
+    needs: maven-publish
     uses: mekomsolutions/shared-github-workflow/.github/workflows/docker-build-publish.yml@main
     with:
+      artifact-name: "fhir-odoo"
+      artifact-path: "fhir-odoo-app/target"
+      download-artifacts: true
       image-name: "fhir-odoo"
     secrets:
       DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_REGISTRY_USERNAME }}

diff --git a/Dockerfile b/Dockerfile
@@ -21,7 +21,7 @@ COPY fhir-odoo-mapper/ fhir-odoo-mapper/
 RUN mvn clean package -DskipTests --no-transfer-progress --batch-mode
 
 # Copy the built JAR file to the container
-COPY fhir-odoo-app/target/fhir-odoo-app-*.jar fhir-odoo.jar
+COPY /fhir-odoo-app/target/fhir-odoo-app-*.jar fhir-odoo.jar
 
 # Expose the port the application runs on
 EXPOSE 8080