knoflook/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' of ssh://git.autonomic.zone:2222/coop-cloud/mastodon into main

Browse Source
This commit is contained in:
decentral1se 2021-05-28 13:46:33 +02:00
commit c658a08702
Signed by untrusted user who does not match committer: decentral1se
GPG Key ID: 92DAD76BD9567B8A
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
compose.yml
View File

@ -26,23 +26,27 @@ services:
volumes: volumes:
- redis:/data - redis:/data
es: es:
image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10 image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.8.10
environment: environment:
- "ES_JAVA_OPTS=-Xms512m -Xmx512m" - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- "cluster.name=es-mastodon" - "cluster.name=es-mastodon"
- "discovery.type=single-node" - "discovery.type=single-node"
- "bootstrap.memory_lock=true" - "bootstrap.memory_lock=true"
networks: networks:
- internal_network - internal_network
healthcheck: healthcheck:
test: ["CMD-SHELL", "curl --silent --fail localhost:9200/_cluster/health || exit 1"] test:
volumes: [
- es:/usr/share/elasticsearch/data "CMD-SHELL",
ulimits: "curl --silent --fail localhost:9200/_cluster/health || exit 1",
memlock: ]
soft: -1 volumes:
hard: -1 - es:/usr/share/elasticsearch/data
ulimits:
memlock:
soft: -1
hard: -1
web: web:
image: &image decentral1se/hometown:v1.0.5_3.4.0 image: &image decentral1se/hometown:v1.0.5_3.4.0
@ -75,7 +79,6 @@ services:
# - "traefik.http.routers.${STACK_NAME}_hack.rule=(Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/`))" # - "traefik.http.routers.${STACK_NAME}_hack.rule=(Host(`${LOCAL_DOMAIN}`) && Path(`/.well-known/`))"
# - "traefik.http.routers.${STACK_NAME}_hack.entrypoints=websecure" # - "traefik.http.routers.${STACK_NAME}_hack.entrypoints=websecure"
# - "traefik.http.routers.${STACK_NAME}_hack.middlewares=mastodon-webfinger@docker" # - "traefik.http.routers.${STACK_NAME}_hack.middlewares=mastodon-webfinger@docker"
## Redirect from EXTRA_DOMAINS to DOMAIN ## Redirect from EXTRA_DOMAINS to DOMAIN
#- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect" #- "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.SSLForceHost=true"