Fix error during rebase
This commit is contained in:
parent
53ae96e0a9
commit
54f0239cbb
@ -5,15 +5,20 @@ services:
|
|||||||
image: postgis/postgis:12-3.1-alpine
|
image: postgis/postgis:12-3.1-alpine
|
||||||
ports:
|
ports:
|
||||||
- "5432:5432"
|
- "5432:5432"
|
||||||
|
volumes:
|
||||||
|
- "./db/data:/var/lib/postgresql/data"
|
||||||
|
environment:
|
||||||
|
- "POSTGRES_PASSWORD=postgres"
|
||||||
|
citizen:
|
||||||
|
tty: true
|
||||||
volumes:
|
volumes:
|
||||||
- ./vendor/GeoNature-citizen/frontend:/home/appuser/citizen/frontend
|
- ./vendor/GeoNature-citizen/frontend:/home/appuser/citizen/frontend
|
||||||
- ./vendor/GeoNature-citizen/backend:/home/appuser/citizen/backend
|
- ./vendor/GeoNature-citizen/backend:/home/appuser/citizen/backend
|
||||||
- ./restart.sh:/home/appuser/citizen/install/restart.sh
|
- ./restart.sh:/home/appuser/citizen/install/restart.sh
|
||||||
- ./patches/frontend/src/conf:/home/appuser/citizen/frontend/src/conf
|
- ./patches/frontend/src/conf:/home/appuser/citizen/frontend/src/conf
|
||||||
- ./patches/frontend/src/assets:/home/appuser/citizen/frontend/src/assets
|
- ./patches/frontend/src/assets:/home/appuser/citizen/frontend/src/assets
|
||||||
- "./db/data:/var/lib/postgresql/data"
|
ports:
|
||||||
environment:
|
- "8888:80"
|
||||||
- "POSTGRES_PASSWORD=postgres"
|
|
||||||
citizen-front:
|
citizen-front:
|
||||||
build:
|
build:
|
||||||
dockerfile: ./Dockerfile-front
|
dockerfile: ./Dockerfile-front
|
||||||
|
Loading…
Reference in New Issue
Block a user