diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d46d32dfd423e41b2f64b83d46f81fdbcc7fe5da..bd0814a523e8711e2603e6e9698a8478b2a2f341 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,6 +2,8 @@ version: "3.5" services: mongodb: image: 'bitnami/mongodb:3.6' + networks: + - backend labels: kompose.service.type: nodeport ports: @@ -12,7 +14,9 @@ services: - MONGODB_DATABASE=diaphen postgres: - image: postgres + image: 'mdillon/postgis' + networks: + - backend restart: always ports: - "5432:5432" @@ -25,6 +29,9 @@ services: php: image: php:7.1-apache + networks: + - backend + - frontend ports: - "80:80" volumes: @@ -32,6 +39,8 @@ services: tomcat: image: 'tomcat:9.0' + networks: + - backend ports: - "8080:8080" volumes: @@ -42,16 +51,13 @@ services: adminer: image: adminer + networks: + - backend + - frontend restart: always ports: - 9090:8080 - phis: - build: "./phis" - links: - - adminer - - tomcat - - php - - postgres - - mongodb - \ No newline at end of file +networks: + frontend: + backend: diff --git a/docker/phis/Dockerfile b/docker/phis/Dockerfile index 2e0cde7b48b2ff14dd3b8e0dcd85455a1126a37f..a9fcafe7e29667e40a05d7eda689a4a3bb588182 100644 --- a/docker/phis/Dockerfile +++ b/docker/phis/Dockerfile @@ -34,7 +34,8 @@ WORKDIR /home/phis # Composer RUN composer global require "fxp/composer-asset-plugin:^1.2.0" -RUN wget "https://github.com/OpenSILEX/docs-community-dev/blob/master/docs/phis_st_dump.sql" +RUN wget "https://raw.githubusercontent.com/OpenSILEX/docs-community-dev/master/docs/phis_st_dump.sql" +ARG PGPASSWORD=azerty RUN psql -h postgres -U phis diaphen < phis_st_dump.sql RUN rm phis_st_dump.sql