diff options
Diffstat (limited to 'deploy/docker-compose.yml')
| -rw-r--r-- | deploy/docker-compose.yml | 109 |
1 files changed, 19 insertions, 90 deletions
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index b6de5fd..f412c55 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -1,34 +1,14 @@ -version: '3' +version: '2.3' services: - nginx: - restart: always - image: nginx:mainline - command: nginx -g 'daemon off;' - networks: - - external_network - - mstweb_network - - mststreaming_network - - netdata_network - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./.docker/nginx/nginx.conf:/etc/nginx/conf.d/default.conf:ro - - ./.docker/nginx/dhparam.pem:/etc/ssl/dhparam.pem:ro - - ./.docker/nginx/certs/fullchain.pem:/etc/ssl/fullchain.pem:ro - - ./.docker/nginx/certs/privkey.pem:/etc/ssl/privkey.pem:ro - - ./.docker/nginx/certs/cert.pem:/etc/ssl/cert.pem:ro - - ./public:/var/www/html:ro - ports: - - "80:80" - - "443:443" - netdata: restart: always image: titpetric/netdata restart: unless-stopped cap_add: - SYS_PTRACE + ports: + - "127.0.0.1:19999:19999" volumes: - ./.docker/netdata:/etc/netdata - /proc:/host/proc:ro @@ -37,7 +17,7 @@ services: - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro networks: - - netdata_network + - external_network mstdb: restart: always @@ -63,7 +43,12 @@ services: # restart: always # image: docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.3 # environment: +# - bootstrap.memory_lock=true # - "ES_JAVA_OPTS=-Xms512m -Xmx512m" +# ulimits: +# memlock: +# soft: -1 +# hard: -1 # networks: # - mstes_network # volumes: @@ -75,88 +60,32 @@ services: image: pluralcafe/mastodon:stable restart: always env_file: ./.docker/mastodon/.env.production - command: bash -c "rake db:migrate; bundle exec rails s -p 3000 -b '0.0.0.0'" networks: - external_network - mstdb_network - mstredis_network - - mstweb_network + ports: + - "127.0.0.1:3000:3000" + - "127.0.0.1:4000:4000" depends_on: - mstdb - mstredis # - mstes volumes: - ./public/system:/mastodon/public/system - - ./public/assets:/tmp/assets - - ./public/packs:/tmp/packs - /etc/localtime:/etc/localtime:ro - /etc/timezone:/etc/timezone:ro - mststreaming: - image: pluralcafe/mastodon:stable - restart: always - env_file: ./.docker/mastodon/.env.production - command: yarn start - networks: - - mstdb_network - - mstredis_network - - mststreaming_network - depends_on: - - mstdb - - mstredis - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - mstsidekiq: - image: pluralcafe/mastodon:stable - restart: always - env_file: ./.docker/mastodon/.env.production - command: bundle exec sidekiq -q default -q mailers -q pull -q push - depends_on: - - mstdb - - mstredis - networks: - - external_network - - mstdb_network - - mstredis_network - - mstweb_network - - mststreaming_network - volumes: - - /etc/localtime:/etc/localtime:ro - - /etc/timezone:/etc/timezone:ro - - ./public/system:/mastodon/public/system - -# mrxsynapse: -# image: avhost/docker-matrix:latest -# restart: always -# command: start -# environment: -# - SERVER_NAME=plural.cafe -# - REPORT_STATS=yes -# - MATRIX_UID=981 -# - MATRIX_GID=981 -# networks: -# - mrxsynapse_network -# - mrxdb_network -# - external_network -# ports: -# - "8448:8448" -# - "3478:3478" -# volumes: -# - /etc/localtime:/etc/localtime:ro -# - /etc/timezone:/etc/timezone:ro -# - ./.docker/matrix:/data - networks: external_network: + driver: bridge + enable_ipv6: true + ipam: + driver: default + config: + - subnet: 172.18.0.0/16 + - subnet: 2001:19f0:5:46d5::/64 mstdb_network: internal: true mstredis_network: internal: true - mststreaming_network: - internal: true - mstweb_network: - internal: true - netdata_network: - internal: true |