Trivy - fix docker file

MTES-MCT · Dec 29, 2023 · 5ee078d · 5ee078d
1 parent 1a71736
commit 5ee078d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
@@ -41,11 +41,18 @@ jobs:
         id: buildx
         uses: docker/setup-buildx-action@v1
 
+      - name: Get Version
+        id: getVersion
+        uses: ./backend
+
+      - name: Print the version
+        run: echo "The version we just got is ${{ steps.getVersion.outputs.version }}"
+
       - name: Build image
         uses: docker/build-push-action@v4
         env:
           GITHUB_SHA: ${{ github.sha }}
-          VERSION: NO_VERSION
+          VERSION: ${{ steps.getVersion.outputs.version }}
           ENV_PROFILE: "prod"
         with:
           context: .

diff --git a/infra/docker/app/DockerfileCI b/infra/docker/app/DockerfileCI
@@ -2,8 +2,8 @@
 # Multi stage build #
 #####################
 
-ARG GITHUB_SHA=NO_COMMIT
-ARG VERSION=NO_VERSION
+ARG GITHUB_SHA
+ARG VERSION
 
 ########################################
 # Build rapportnav backend with maven #
@@ -18,8 +18,8 @@ RUN mvn dependency:go-offline -B
 # Stage 2: Build the application
 FROM maven:3.8.5-openjdk-17-slim as build-backend
 
-ARG GITHUB_SHA=NO_COMMIT
-ARG VERSION=NO_VERSION
+ARG GITHUB_SHA
+ARG VERSION
 
 WORKDIR /tmp/backend
 COPY backend/ /tmp/backend