From 50f8af1ef573a45217b1d45ae093b35b7fc519a3 Mon Sep 17 00:00:00 2001
From: CiteLibre <123391176+citelibre@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:34:05 +0100
Subject: [PATCH] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 5fd4f34..a3ef3a1 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -29,7 +29,7 @@ jobs:
     - name: docker login
       run: docker login -u=citelibre -p="${{ secrets.PASSWORD_DOCKER_CITELIBRE }}"
     - name: Retrieve version in pom with Maven
-      run: echo "VERSION=$(cd citelibre-serviceEZ && mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')">> $GITHUB_ENV
+      run: echo "VERSION=$(cd citelibre-identEZ && mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')">> $GITHUB_ENV
 
     - name: Display version
       run: echo "version $VERSION"
@@ -38,21 +38,21 @@ jobs:
       run: time curl -v https://dev.lutece.paris.fr/maven_repository/fr/paris/lutece/lutece-core/7.0.10/lutece-core-7.0.10-webapp.zip -o test.zip 
       
     - name: build war ihm
-      run: cd citelibre-serviceEZ && mkdir -p $HOME/.m2/repository/fr/paris/lutece/lutece-core/7.0.10/ && curl --http1.0 -L https://dev.lutece.paris.fr/maven_repository/fr/paris/lutece/lutece-core/7.0.10/lutece-core-7.0.10-webapp.zip -o $HOME/.m2/repository/fr/paris/lutece/lutece-core/7.0.10/lutece-core-7.0.10-webapp.zip && mvn -e lutece:site-assembly -Pdev
+      run: cd citelibre-identEZ && mkdir -p $HOME/.m2/repository/fr/paris/lutece/lutece-core/7.0.10/ && curl --http1.0 -L https://dev.lutece.paris.fr/maven_repository/fr/paris/lutece/lutece-core/7.0.10/lutece-core-7.0.10-webapp.zip -o $HOME/.m2/repository/fr/paris/lutece/lutece-core/7.0.10/lutece-core-7.0.10-webapp.zip && mvn -e lutece:site-assembly -Pdev
       
     - name: retrieve war name
-      run:  echo "WAR_NAME=$(cd citelibre-serviceEZ/target; ls *.war|sed -e 's/\.war//g')" >> $GITHUB_ENV
+      run:  echo "WAR_NAME=$(cd citelibre-identEZ/target; ls *.war|sed -e 's/\.war//g')" >> $GITHUB_ENV
       
-    - name: build serviceEZ
-      run: docker build citelibre-serviceEZ --build-arg site=$WAR_NAME -t citelibre/service_ez:ihm-$VERSION
+    - name: build identEZ
+      run: docker build citelibre-identEZ --build-arg site=$WAR_NAME -t citelibre/service_ez:ihm-$VERSION
     
-    - name: build serviceEZ  
-      run: docker save -o citelibre-serviceEZ.tar citelibre/service_ez:ihm-$VERSION
+    - name: build identEZ  
+      run: docker save -o citelibre-identEZ.tar citelibre/service_ez:ihm-$VERSION
       
-    - name: Run Trivy vulnerability scanner in tarball mode of serviceEZ image
+    - name: Run Trivy vulnerability scanner in tarball mode of identEZ image
       uses: aquasecurity/trivy-action@master
       with:
-        input: /github/workspace/citelibre-serviceEZ.tar
+        input: /github/workspace/citelibre-identEZ.tar
         severity: 'CRITICAL,HIGH'
         format: 'sarif'
         output: 'trivy-results.sarif'
@@ -99,7 +99,7 @@ jobs:
         
     - name: Commit and push docker compose
       run: |
-        rm -rf citelibre-serviceEZ/target
+        rm -rf citelibre-identEZ/target
         git config --global user.name "githubaction"
         git config --global user.email "githubaction"
         git add docker-compose.yml