parent
d422ef3316
commit
844702337a
|
@ -2,7 +2,7 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
codimd:
|
app:
|
||||||
environment:
|
environment:
|
||||||
- CMD_OAUTH2_PROVIDERNAME
|
- CMD_OAUTH2_PROVIDERNAME
|
||||||
- CMD_OAUTH2_BASEURL
|
- CMD_OAUTH2_BASEURL
|
||||||
|
|
42
compose.yml
42
compose.yml
|
@ -2,30 +2,17 @@
|
||||||
version: "3.8"
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
postgres:
|
|
||||||
image: postgres:11.6-alpine
|
|
||||||
environment:
|
|
||||||
- POSTGRES_USER=codimd
|
|
||||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
|
||||||
- POSTGRES_DB=codimd
|
|
||||||
volumes:
|
|
||||||
- "postgres:/var/lib/postgresql/data"
|
|
||||||
secrets:
|
|
||||||
- db_password
|
|
||||||
networks:
|
|
||||||
- internal
|
|
||||||
|
|
||||||
codimd:
|
codimd:
|
||||||
image: nabo.codimd.dev/hackmdio/hackmd:2.1.0
|
image: nabo.codimd.dev/hackmdio/hackmd:2.1.0
|
||||||
environment:
|
environment:
|
||||||
- CMD_USECDN=false
|
- CMD_USECDN=false
|
||||||
- CMD_DB_NAME=codimd
|
- CMD_DB_NAME=codimd
|
||||||
- CMD_DB_USER=codimd
|
- CMD_DB_USER=codimd
|
||||||
- CMD_DB_HOST=postgres
|
- CMD_DB_HOST=db
|
||||||
- CMD_DB_PASSWORD_FILE=/run/secrets/db_password
|
- CMD_DB_PASSWORD_FILE=/run/secrets/db_password
|
||||||
- CMD_EMAIL # Email login enabled?
|
- CMD_EMAIL # Email login enabled?
|
||||||
depends_on:
|
depends_on:
|
||||||
- postgres
|
- db
|
||||||
networks:
|
networks:
|
||||||
- proxy
|
- proxy
|
||||||
- internal
|
- internal
|
||||||
|
@ -35,8 +22,8 @@ services:
|
||||||
- db_password
|
- db_password
|
||||||
entrypoint: /docker-entrypoint2.sh
|
entrypoint: /docker-entrypoint2.sh
|
||||||
configs:
|
configs:
|
||||||
- source: entrypoint2_conf
|
- source: entrypoint_conf
|
||||||
target: /docker-entrypoint2.sh
|
target: /docker-entrypoint.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
|
@ -49,6 +36,9 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "wget", "-qO", "-", "http://localhost:3000"]
|
test: ["CMD", "wget", "-qO", "-", "http://localhost:3000"]
|
||||||
interval: 30s
|
interval: 30s
|
||||||
|
@ -56,6 +46,20 @@ services:
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 1m
|
start_period: 1m
|
||||||
|
|
||||||
|
db:
|
||||||
|
image: postgres:11.6-alpine
|
||||||
|
environment:
|
||||||
|
- POSTGRES_USER=codimd
|
||||||
|
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||||
|
- POSTGRES_DB=codimd
|
||||||
|
volumes:
|
||||||
|
- "postgres:/var/lib/postgresql/data"
|
||||||
|
secrets:
|
||||||
|
- db_password
|
||||||
|
networks:
|
||||||
|
- internal
|
||||||
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres:
|
postgres:
|
||||||
codimd_uploads:
|
codimd_uploads:
|
||||||
|
@ -71,7 +75,7 @@ networks:
|
||||||
internal:
|
internal:
|
||||||
|
|
||||||
configs:
|
configs:
|
||||||
entrypoint2_conf:
|
entrypoint_conf:
|
||||||
name: ${STACK_NAME}_entrypoint2_${ENTRYPOINT_CONF_VERSION}
|
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
|
||||||
file: entrypoint.sh.tmpl
|
file: entrypoint.sh.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
|
|
@ -36,6 +36,7 @@ main
|
||||||
|
|
||||||
export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST/$CMD_DB_NAME
|
export CMD_DB_URL=postgres://$CMD_DB_USER:$CMD_DB_PASSWORD@$CMD_DB_HOST/$CMD_DB_NAME
|
||||||
|
|
||||||
|
# 3wc: `source /docker-entrypoint.sh -e` to load CMD_DB_URL for CLI scripts
|
||||||
if [ ! "${1-}" == "-e" ]; then
|
if [ ! "${1-}" == "-e" ]; then
|
||||||
# 3wc: upstream ENTRYPOINT
|
# 3wc: upstream ENTRYPOINT
|
||||||
# https://github.com/hackmdio/codimd/blob/develop/deployments/Dockerfile
|
# https://github.com/hackmdio/codimd/blob/develop/deployments/Dockerfile
|
||||||
|
|
Loading…
Reference in New Issue