Made docker-compose.yml indentation consistent.

This commit is contained in:
2018-01-12 11:55:07 +01:00
parent 5c26756626
commit 0ed03240e7

View File

@@ -1,172 +1,172 @@
version: '3.4' version: '3.4'
services: services:
mongo: mongo:
image: mongo:3.4.2 image: mongo:3.4.2
container_name: mongo container_name: mongo
restart: always restart: always
volumes: volumes:
- /data/storage/db:/data/db - /data/storage/db:/data/db
- /data/storage/db-bak:/data/db-bak # for backing up stuff etc. - /data/storage/db-bak:/data/db-bak # for backing up stuff etc.
ports: ports:
- "127.0.0.1:27017:27017" - "127.0.0.1:27017:27017"
redis: redis:
image: redis:3.2.8 image: redis:3.2.8
container_name: redis container_name: redis
restart: always restart: always
ports: ports:
- "127.0.0.1:6379:6379" - "127.0.0.1:6379:6379"
rabbit: rabbit:
image: rabbitmq:3.6.10 image: rabbitmq:3.6.10
container_name: rabbit container_name: rabbit
restart: always restart: always
ports: ports:
- "127.0.0.1:5672:5672" - "127.0.0.1:5672:5672"
elastic: elastic:
image: armadillica/elasticsearch:latest image: armadillica/elasticsearch:latest
container_name: elastic container_name: elastic
restart: always restart: always
volumes: volumes:
# NOTE: this path must be writable by UID=1000 GID=1000. # NOTE: this path must be writable by UID=1000 GID=1000.
- /data/storage/elastic:/usr/share/elasticsearch/data - /data/storage/elastic:/usr/share/elasticsearch/data
ports: ports:
- "127.0.0.1:9200:9200" - "127.0.0.1:9200:9200"
environment: environment:
ES_JAVA_OPTS: "-Xms256m -Xmx256m" ES_JAVA_OPTS: "-Xms256m -Xmx256m"
elasticproxy: elasticproxy:
image: armadillica/elasticproxy:latest image: armadillica/elasticproxy:latest
container_name: elasticproxy container_name: elasticproxy
restart: always restart: always
command: /elasticproxy -elastic http://elastic:9200/ command: /elasticproxy -elastic http://elastic:9200/
depends_on: depends_on:
- elastic - elastic
kibana: kibana:
image: armadillica/kibana:latest image: armadillica/kibana:latest
container_name: kibana container_name: kibana
restart: always restart: always
environment: environment:
SERVER_NAME: "stats.cloud.blender.org" SERVER_NAME: "stats.cloud.blender.org"
ELASTICSEARCH_URL: http://elasticproxy:9200 ELASTICSEARCH_URL: http://elasticproxy:9200
CONSOLE_ENABLED: 'false' CONSOLE_ENABLED: 'false'
VIRTUAL_HOST: http://stats.cloud.blender.org/*,https://stats.cloud.blender.org/*,http://stats.blender-cloud/*,https://stats.blender-cloud/* VIRTUAL_HOST: http://stats.cloud.blender.org/*,https://stats.cloud.blender.org/*,http://stats.blender-cloud/*,https://stats.blender-cloud/*
VIRTUAL_HOST_WEIGHT: 20 VIRTUAL_HOST_WEIGHT: 20
FORCE_SSL: "true" FORCE_SSL: "true"
# See https://github.com/elastic/kibana/issues/5170#issuecomment-163042525 # See https://github.com/elastic/kibana/issues/5170#issuecomment-163042525
NODE_OPTIONS: "--max-old-space-size=200" NODE_OPTIONS: "--max-old-space-size=200"
depends_on: depends_on:
- elasticproxy - elasticproxy
blender_cloud: blender_cloud:
image: armadillica/blender_cloud:latest image: armadillica/blender_cloud:latest
container_name: blender_cloud container_name: blender_cloud
restart: always restart: always
environment: environment:
VIRTUAL_HOST: http://cloud.blender.org/*,https://cloud.blender.org/*,http://blender-cloud/*,https://blender-cloud/* VIRTUAL_HOST: http://cloud.blender.org/*,https://cloud.blender.org/*,http://blender-cloud/*,https://blender-cloud/*
VIRTUAL_HOST_WEIGHT: 10 VIRTUAL_HOST_WEIGHT: 10
FORCE_SSL: "true" FORCE_SSL: "true"
GZIP_COMPRESSION_TYPE: "text/html text/plain text/css application/javascript" GZIP_COMPRESSION_TYPE: "text/html text/plain text/css application/javascript"
volumes: volumes:
# format: HOST:CONTAINER # format: HOST:CONTAINER
- /data/git:/data/git:ro - /data/git:/data/git:ro
- /data/config:/data/config:ro - /data/config:/data/config:ro
- /data/storage/pillar:/data/storage/pillar - /data/storage/pillar:/data/storage/pillar
- /data/log:/var/log - /data/log:/var/log
depends_on: depends_on:
- mongo - mongo
- redis - redis
- rabbit - rabbit
celery_worker: celery_worker:
image: armadillica/blender_cloud:latest image: armadillica/blender_cloud:latest
entrypoint: /celery-worker.sh entrypoint: /celery-worker.sh
container_name: celery_worker container_name: celery_worker
restart: always restart: always
volumes: volumes:
# format: HOST:CONTAINER # format: HOST:CONTAINER
- /data/git:/data/git:ro - /data/git:/data/git:ro
- /data/config:/data/config:ro - /data/config:/data/config:ro
- /data/storage/pillar:/data/storage/pillar - /data/storage/pillar:/data/storage/pillar
- /data/log:/var/log - /data/log:/var/log
depends_on: depends_on:
- mongo - mongo
- redis - redis
- rabbit - rabbit
celery_beat: celery_beat:
image: armadillica/blender_cloud:latest image: armadillica/blender_cloud:latest
entrypoint: /celery-beat.sh entrypoint: /celery-beat.sh
container_name: celery_beat container_name: celery_beat
restart: always restart: always
volumes: volumes:
# format: HOST:CONTAINER # format: HOST:CONTAINER
- /data/git:/data/git:ro - /data/git:/data/git:ro
- /data/storage/pillar:/data/storage/pillar - /data/storage/pillar:/data/storage/pillar
- /data/log:/var/log - /data/log:/var/log
depends_on: depends_on:
- mongo - mongo
- redis - redis
- rabbit - rabbit
logging: logging:
driver: "json-file" driver: "json-file"
options: options:
max-size: "200k" max-size: "200k"
max-file: "20" max-file: "20"
# notifserv: # notifserv:
# container_name: notifserv # container_name: notifserv
# image: armadillica/pillar-notifserv:cd8fa678436563ac3b800b2721e36830c32e4656 # image: armadillica/pillar-notifserv:cd8fa678436563ac3b800b2721e36830c32e4656
# restart: always # restart: always
# links: # links:
# - mongo # - mongo
# environment: # environment:
# VIRTUAL_HOST: https://cloud.blender.org/notifications*,http://pillar-web/notifications* # VIRTUAL_HOST: https://cloud.blender.org/notifications*,http://pillar-web/notifications*
# VIRTUAL_HOST_WEIGHT: 20 # VIRTUAL_HOST_WEIGHT: 20
# FORCE_SSL: true # FORCE_SSL: true
grafista: grafista:
image: armadillica/grafista:latest image: armadillica/grafista:latest
container_name: grafista container_name: grafista
restart: always restart: always
volumes: volumes:
- /data/git/grafista:/data/git/grafista:ro - /data/git/grafista:/data/git/grafista:ro
- /data/storage/grafista:/data/storage/grafista - /data/storage/grafista:/data/storage/grafista
letsencrypt: letsencrypt:
image: armadillica/picohttp:latest image: armadillica/picohttp:latest
container_name: letsencrypt container_name: letsencrypt
restart: always restart: always
environment: environment:
WEBROOT: /data/letsencrypt WEBROOT: /data/letsencrypt
LISTEN: '[::]:80' LISTEN: '[::]:80'
VIRTUAL_HOST: http://cloud.blender.org/.well-known/*, http://stats.cloud.blender.org/.well-known/* VIRTUAL_HOST: http://cloud.blender.org/.well-known/*, http://stats.cloud.blender.org/.well-known/*
VIRTUAL_HOST_WEIGHT: 20 VIRTUAL_HOST_WEIGHT: 20
volumes: volumes:
- /data/letsencrypt:/data/letsencrypt - /data/letsencrypt:/data/letsencrypt
haproxy: haproxy:
image: dockercloud/haproxy:1.5.3 image: dockercloud/haproxy:1.5.3
container_name: haproxy container_name: haproxy
restart: always restart: always
ports: ports:
- "443:443" - "443:443"
- "80:80" - "80:80"
environment: environment:
- ADDITIONAL_SERVICES=docker:blender_cloud,docker:letsencrypt,docker:kibana - ADDITIONAL_SERVICES=docker:blender_cloud,docker:letsencrypt,docker:kibana
- CERT_FOLDER=/certs/ - CERT_FOLDER=/certs/
- TIMEOUT=connect 5s, client 5m, server 10m - TIMEOUT=connect 5s, client 5m, server 10m
- SSL_BIND_CIPHERS=ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:RSA+AESGCM:RSA+AES:!aNULL:!MD5:!DSS - SSL_BIND_CIPHERS=ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:RSA+AESGCM:RSA+AES:!aNULL:!MD5:!DSS
- SSL_BIND_OPTIONS=no-sslv3 - SSL_BIND_OPTIONS=no-sslv3
- EXTRA_GLOBAL_SETTINGS=tune.ssl.default-dh-param 2048 - EXTRA_GLOBAL_SETTINGS=tune.ssl.default-dh-param 2048
depends_on: depends_on:
- blender_cloud - blender_cloud
# - notifserv # - notifserv
- letsencrypt - letsencrypt
- kibana - kibana
volumes: volumes:
- '/data/certs:/certs' - '/data/certs:/certs'
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock