Merge branch 'master' of git.clkl.de:agp8x/partdoc

docker-compose.yml

@@ -2,7 +2,7 @@ version: "2"
 
 services:
  web:
-  image: docker.clkl.de/partdoc/web:0.1
+  image: docker.clkl.de/partdoc/web:0.3
   build: partdoc
   env_file: postgres.env
   volumes:
@@ -12,8 +12,10 @@ services:
   command: python3 ./manage.py runserver 0.0.0.0:8000
   ports:
    - 8080:8000
+  depends_on:
+   - db
  db:
-  image: postgres:10-alpine
+  image: postgres:12-alpine
   volumes:
    - ./pgdata/:/var/lib/postgresql/data/
-  env_file: postgres.env
+  env_file: postgres.env

migrate_postgres.sh

@@ -0,0 +1,11 @@
+# start old postgres, dump data
+sed -i 's/postgres:12-alpine/postgres:10-alpine/' docker-compose.yml
+docker-compose exec db pg_dumpall -U partdoc > pgdump.tmp
+# migrate to new postgres, import data
+docker-compose stop db
+sed -i 's/postgres:10-alpine/postgres:12-alpine/' docker-compose.yml
+docker-compose up -d
+docker-compose exec -T db psql -U partdoc < pgdump.tmp
+docker-compose down
+docker-compose up -d
+rm pgdump.tmp

partdoc/Dockerfile

@@ -1,6 +1,8 @@
-FROM alpine:3.7
+FROM alpine:3.10
 
 ADD requirements.txt /
 RUN apk add --update --no-cache python3 py3-psycopg2 && \
 	sed -i 's/psycopg2/#psycopg2/' /requirements.txt && \
-	pip3 install -r /requirements.txt && rm /requirements.txt
+	pip3 install -r /requirements.txt && rm /requirements.txt && \
+	adduser -D django
+USER django

partdoc/requirements.txt

@@ -1,2 +1,2 @@
-django==2.0.1
+django==3.0
-psycopg2==2.7.3.2
+psycopg2==2.8.4