benutze ansible variablen
This commit is contained in:
parent
d0ec335f2b
commit
0d70381329
|
@ -13,7 +13,7 @@ services:
|
||||||
db:
|
db:
|
||||||
# Don't upgrade PostgreSQL by simply changing the version number
|
# Don't upgrade PostgreSQL by simply changing the version number
|
||||||
# You need to migrate the Database to the new PostgreSQL version
|
# You need to migrate the Database to the new PostgreSQL version
|
||||||
image: postgres:9.6-alpine
|
image: postgres {{ hedgedoc.postgresql_version }}
|
||||||
container_name: hedgedoc-db
|
container_name: hedgedoc-db
|
||||||
#mem_limit: 256mb # version 2 only
|
#mem_limit: 256mb # version 2 only
|
||||||
#memswap_limit: 512mb # version 2 only
|
#memswap_limit: 512mb # version 2 only
|
||||||
|
@ -21,11 +21,10 @@ services:
|
||||||
#tmpfs:
|
#tmpfs:
|
||||||
# - /run/postgresql:size=512K
|
# - /run/postgresql:size=512K
|
||||||
# - /tmp:size=256K
|
# - /tmp:size=256K
|
||||||
env_file: /home/docker/env/hedgedoc.env
|
|
||||||
environment:
|
environment:
|
||||||
- POSTGRES_USER=${POSTGRES_USER}
|
- POSTGRES_USER: "{{ havelwerk.hedgedoc.postgresql_user }}"
|
||||||
- POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
|
- POSTGRES_PASSWORD: "{{ havelwerk.hedgedoc.postgresql_password }}"
|
||||||
- POSTGRES_DB=${POSTGRES_DB}
|
- POSTGRES_DB: "{{ havelwerk.hedgedoc.postgresql_db }}"
|
||||||
volumes:
|
volumes:
|
||||||
- /home/docker/data/hedgedoc/db:/var/lib/postgresql/data
|
- /home/docker/data/hedgedoc/db:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
|
@ -40,9 +39,8 @@ services:
|
||||||
# args:
|
# args:
|
||||||
# - "VERSION=master"
|
# - "VERSION=master"
|
||||||
# - "HEDGEDOC_REPOSITORY=https://github.com/hedgedoc/hedgedoc.git"
|
# - "HEDGEDOC_REPOSITORY=https://github.com/hedgedoc/hedgedoc.git"
|
||||||
image: quay.io/hedgedoc/hedgedoc:1.9.7
|
image: quay.io/hedgedoc/hedgedoc:{{ hedgedoc.release }}
|
||||||
container_name: hedgedoc
|
container_name: hedgedoc
|
||||||
env_file: /home/docker/env/hedgedoc.env
|
|
||||||
#mem_limit: 256mb # version 2 only
|
#mem_limit: 256mb # version 2 only
|
||||||
#memswap_limit: 512mb # version 2 only
|
#memswap_limit: 512mb # version 2 only
|
||||||
#read_only: true # not supported in swarm mode, enable along with tmpfs
|
#read_only: true # not supported in swarm mode, enable along with tmpfs
|
||||||
|
@ -66,7 +64,7 @@ services:
|
||||||
- CMD_ALLOW_ANONYMOUS_EDITS=true
|
- CMD_ALLOW_ANONYMOUS_EDITS=true
|
||||||
- CMD_DEFAULT_PERMISSION=limited
|
- CMD_DEFAULT_PERMISSION=limited
|
||||||
- CMD_IMAGE_UPLOAD_TYPE=filesystem
|
- CMD_IMAGE_UPLOAD_TYPE=filesystem
|
||||||
- CMD_DB_URL=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@hedgedoc-db:5432/${POSTGRES_DB}
|
- CMD_DB_URL=postgres://{{ havelwerk.hedgedoc.postgresql_user }}:{{ havelwerk.hedgedoc.postgresql_password }}@hedgedoc-db:5432/{{ havelwerk.hedgedoc.postgresql_db }}
|
||||||
- CMD_ALLOW_PDF_EXPORT=true
|
- CMD_ALLOW_PDF_EXPORT=true
|
||||||
- CMD_ALLOW_FREEURL=true
|
- CMD_ALLOW_FREEURL=true
|
||||||
volumes:
|
volumes:
|
||||||
|
|
Loading…
Reference in New Issue