Merge branch 'current'

This commit is contained in:
Andreas Zweili 2020-02-15 00:36:34 +01:00
commit 55ba1f0375
2 changed files with 2 additions and 5 deletions

View File

@ -1,15 +1,12 @@
version: '3' version: '3'
volumes:
db_data:
services: services:
db: db:
image: postgres image: postgres
environment: environment:
- POSTGRES_DB=network_inventory - POSTGRES_DB=network_inventory
volumes: volumes:
- db_data:/var/lib/postgresql/data/ - ./db_data:/var/lib/postgresql/data/
web: web:
build: . build: .

View File

@ -1,5 +1,5 @@
wheel wheel
Django==2.2.8 Django==2.2.10
pyaml pyaml
pytz pytz
django-guardian django-guardian