docker-compose.yml

@@ -4,16 +4,17 @@
 version: '3'
 
 networks:
-  default:
+  webproxy:
-  proxynet:
+    external: true
+
+  backend-hedgedoc:
     external: true
 
 services:
-
+  database:
-  db:
     # Don't upgrade PostgreSQL by simply changing the version number
     # You need to migrate the Database to the new PostgreSQL version
-    image: postgres {{ hedgedoc.postgresql_version }}
+    image: postgres:9.6-alpine
     container_name: hedgedoc-db
     #mem_limit: 256mb         # version 2 only
     #memswap_limit: 512mb     # version 2 only
@@ -22,13 +23,13 @@ services:
     #  - /run/postgresql:size=512K
     #  - /tmp:size=256K
     environment:
-      - POSTGRES_USER: "{{ havelwerk.hedgedoc.postgresql_user }}"
+      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD: "{{ havelwerk.hedgedoc.postgresql_password }}"
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB: "{{ havelwerk.hedgedoc.postgresql_db }}"
+      - POSTGRES_DB=${POSTGRES_DB}
     volumes:
-      - /home/docker/data/hedgedoc/db:/var/lib/postgresql/data
+      - /opt/appdata/hedgedoc/db:/var/lib/postgresql/data
     networks:
-      default:
+      - backend-hedgedoc
     restart: always
 
   app:
@@ -39,7 +40,7 @@ services:
     #  args:
     #    - "VERSION=master"
     #    - "HEDGEDOC_REPOSITORY=https://github.com/hedgedoc/hedgedoc.git"
-    image: quay.io/hedgedoc/hedgedoc:{{ hedgedoc.release }}
+    image: quay.io/hedgedoc/hedgedoc:1.9.2
     container_name: hedgedoc
     #mem_limit: 256mb         # version 2 only
     #memswap_limit: 512mb     # version 2 only
@@ -55,7 +56,7 @@ services:
       # - sqlite:///data/sqlite.db (NOT RECOMMENDED)
       # - For details see the official sequelize docs: http://docs.sequelizejs.com/en/v3/
       # - CMD_DB_URL=postgres://hedgedoc:password@database:5432/hedgedoc
-      - CMD_DOMAIN=${URL}
+      - CMD_DOMAIN=md.bmen.cc
       - CMD_URL_ADDPORT=false
       - CMD_PROTOCOL_USESSL=true
       #- CMD_EMAIL=false
@@ -64,11 +65,11 @@ services:
       - CMD_ALLOW_ANONYMOUS_EDITS=true
       - CMD_DEFAULT_PERMISSION=limited
       - CMD_IMAGE_UPLOAD_TYPE=filesystem
-      - CMD_DB_URL=postgres://{{ havelwerk.hedgedoc.postgresql_user }}:{{ havelwerk.hedgedoc.postgresql_password }}@hedgedoc-db:5432/{{ havelwerk.hedgedoc.postgresql_db }}
+      - CMD_DB_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@hedgedoc-db:5432/${POSTGRES_DB}
       - CMD_ALLOW_PDF_EXPORT=true
       - CMD_ALLOW_FREEURL=true
     volumes:
-      - /home/docker/data/hedgedoc:/hedgedoc/public/uploads
+      - /opt/appdata/hedgedoc/uploads:/hedgedoc/public/uploads
     # ports:
       # Ports that are published to the outside.
       # The latter port is the port inside the container. It should always stay on 3000
@@ -78,10 +79,8 @@ services:
       # - "127.0.0.1:3000:3000"
       # - "3000:3000"
     networks:
-      default:
+      - webproxy
-      proxynet:
+      - backend-hedgedoc
-        aliases:
-          - hedgedoc
     restart: always
     depends_on:
-      - db
+      - database