diff --git a/.github/workflows/deploy-on-docker.yml b/.github/workflows/deploy-on-docker.yml index 1659cbe02..8a23eab7d 100644 --- 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 b/app-web.Dockerfile similarity index 100% rename from app.Dockerfile rename to app-web.Dockerfile diff --git a/db.Dockerfile b/db.Dockerfile deleted file mode 100644 index 8fab0dc85..000000000 --- a/db.Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM postgres:9.6 -RUN localedef -i fr_FR -c -f UTF-8 -A /usr/share/locale/locale.alias fr_FR.UTF-8 -ENV LANG fr_FR.utf8 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 2382beee9..000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,29 +0,0 @@ -version: '3' -services: - app: - build: - context: . - dockerfile: app.Dockerfile - args: - DATABASE_URL: jdbc:postgresql://db:5432/arc - DATABASE_USER: postgres - DATABASE_PASSWORD: password - DATABASE_RESTRICTED_USER: arc_restricted - APPLICATION_DIRECTORY: ./ - DISABLE_DEBUG_GUI : y - ports: - - 8080:8080 - depends_on: - - db - db: - build: - context: . - dockerfile: db.Dockerfile - restart: always - environment: - POSTGRES_PASSWORD: password - POSTGRES_USER: postgres - POSTGRES_DB: arc - ports: - - 5432:5432 - diff --git a/script.sh b/script.sh index 94ea02961..f0f3c083a 100755 --- 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; \ No newline at end of file