Skip to content

Commit

Permalink
folder and volumes reorder
Browse files Browse the repository at this point in the history
  • Loading branch information
enricofer committed Jun 15, 2024
1 parent 5b42afb commit e0d9724
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
*.pyc
__pycache__
webapp/static*
media/*
kart_versions/*
data/static/*
data/media/*
data/kart_versions/*
data/pgdata/*
test_data*

.DS_Store

Expand Down
15 changes: 8 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ services:
depends_on:
- postgis_djakart
volumes:
- ./media:/media
- ./data/media:/media
- ./data/static:/app/static
- ./webapp:/app
- ./kart_versions:/kart_versions
- ./data/kart_versions:/kart_versions
healthcheck:
test: wget -qO- http://localhost:8000/healthcheck/ || exit 1
start_period: 30s
Expand All @@ -34,7 +35,7 @@ services:
ports:
- 5435:5432
volumes:
- djakart_pgdata:/var/lib/postgresql/pgdata/
- ./data/pgdata:/var/lib/postgresql/pgdata/
- ./initdb.sh:/docker-entrypoint-initdb.d/initdb.sh

qgisserver_djakart:
Expand All @@ -43,7 +44,7 @@ services:
- .env
volumes:
#- ./servizi:/servizi
- ./kart_versions:/kart_versions
- ./data/kart_versions:/kart_versions
- ./webapp/djakart/otf_qgisserver_plugin:/plugins/otf_qgisserver_plugin
- ./000-default.conf:/etc/apache2/sites-enabled/000-default.conf

Expand All @@ -52,13 +53,13 @@ services:
env_file:
- .env
volumes:
- ./webapp/static:/static
- ./data/static:/static
- ./nginx.conf:/etc/nginx/conf.d/default.conf
ports:
- 9889:80
depends_on:
- qgisserver_djakart
- webapp_djakart

volumes:
djakart_pgdata:
#volumes:
# djakart_pgdata:
1 change: 0 additions & 1 deletion kart_versions/readme.txt

This file was deleted.

1 change: 0 additions & 1 deletion media/readme.txt

This file was deleted.

0 comments on commit e0d9724

Please sign in to comment.