Merge branch 'current'

2020-02-15 00:36:34 +01:00 · 2020-02-15 00:36:34 +01:00 · 55ba1f0375
parent 7c26504208 0d14efdd00
commit 55ba1f0375
2 changed files with 2 additions and 5 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,15 +1,12 @@
 version: '3'

-volumes:
-  db_data:
-
 services:
  db:
    image: postgres
    environment:
      - POSTGRES_DB=network_inventory
    volumes:
-      - db_data:/var/lib/postgresql/data/
+      - ./db_data:/var/lib/postgresql/data/

  web:
    build: .
--- a/requirements/base.txt
+++ b/requirements/base.txt
@ -1,5 +1,5 @@
 wheel
-Django==2.2.8
+Django==2.2.10
 pyaml
 pytz
 django-guardian