fix: removed unued docker compose

InseeFr · Nov 6, 2023 · a8e9810 · a8e9810
1 parent 90e8410
commit a8e9810
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 35 deletions.
diff --git a/.github/workflows/deploy-on-docker.yml b/.github/workflows/deploy-on-docker.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           push: true
           context: .
-          file: ./app.Dockerfile
+          file: ./app-web.Dockerfile
           tags: |
             ${{ github.event_name == 'release' && format('inseefr/arc:{0}', github.event.release.tag_name) || '' }}
             ${{ github.ref == 'refs/heads/master' && 'inseefr/arc:latest' || '' }}

diff --git a/app.Dockerfile → app-web.Dockerfile b/app.Dockerfile → app-web.Dockerfile
diff --git a/db.Dockerfile b/db.Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
diff --git a/script.sh b/script.sh
@@ -37,6 +37,4 @@ echo "maven settings.xml set to $MAVEN_SETTINGS";
 MAVEN_CONF="-s usr/src/app/$MAVEN_SETTINGS";
 fi
 
-# echo "mvn -f /usr/src/app/pom.xml clean package -DskipTests $MAVEN_CONF -Pdocker -Denv.logSettings=$LOG_SETTINGS -Denv.urlDatabase=$DATABASE_URL  -Denv.usernameDatabase=$DATABASE_USER  -Denv.passwordDatabase=$DATABASE_PASSWORD -Denv.restrictedUserDatabase=$DATABASE_RESTRICTED_USER -Denv.applicationDirectory=$APPLICATION_DIRECTORY -Denv.disableDebugGui=$DISABLE_DEBUG_GUI";
-
 mvn -f /usr/src/app/pom.xml clean package -DskipTests $MAVEN_CONF -Pdocker -Denv.logSettings=$LOG_SETTINGS -Denv.urlDatabase=$DATABASE_URL  -Denv.usernameDatabase=$DATABASE_USER  -Denv.passwordDatabase=$DATABASE_PASSWORD -Denv.restrictedUserDatabase=$DATABASE_RESTRICTED_USER -Denv.applicationDirectory=$APPLICATION_DIRECTORY -Denv.disableDebugGui=$DISABLE_DEBUG_GUI;