Merge branch 'master' into dev

docs/docker/postgres/docker-compose.yml

@@ -5,12 +5,13 @@ services:
     image: postgres
     container_name: postgres
     volumes:
-      - db:/var/lib/postgres
+      - ./postgres:/var/lib/postgresql/data
       - /etc/localtime:/etc/localtime:ro
     environment:
       - POSTGRES_USER=gancio
       - POSTGRES_DB=gancio
       - POSTGRES_PASSWORD=gancio
+      - PGDATA=/var/lib/postgresql/data
     restart: always
     ports:
         - 5432:5432
@@ -28,4 +29,8 @@ services:
     depends_on:
         - db
     ports:
+<<<<<<< HEAD
       - "127.0.0.1:13120:13120"
+=======
+      - 127.0.0.1:13120:13120
+>>>>>>> master