Fix error during rebase

This commit is contained in:
Marc Ducobu 2021-05-31 15:58:46 +02:00
parent 53ae96e0a9
commit 54f0239cbb

View File

@ -5,15 +5,20 @@ services:
image: postgis/postgis:12-3.1-alpine
ports:
- "5432:5432"
volumes:
- "./db/data:/var/lib/postgresql/data"
environment:
- "POSTGRES_PASSWORD=postgres"
citizen:
tty: true
volumes:
- ./vendor/GeoNature-citizen/frontend:/home/appuser/citizen/frontend
- ./vendor/GeoNature-citizen/backend:/home/appuser/citizen/backend
- ./restart.sh:/home/appuser/citizen/install/restart.sh
- ./patches/frontend/src/conf:/home/appuser/citizen/frontend/src/conf
- ./patches/frontend/src/assets:/home/appuser/citizen/frontend/src/assets
- "./db/data:/var/lib/postgresql/data"
environment:
- "POSTGRES_PASSWORD=postgres"
ports:
- "8888:80"
citizen-front:
build:
dockerfile: ./Dockerfile-front