diff --git a/mediawiki/docker-compose.yml b/mediawiki/docker-compose.yml index 3b257ba..5cecea3 100644 --- a/mediawiki/docker-compose.yml +++ b/mediawiki/docker-compose.yml @@ -1,3 +1,6 @@ +networks: + - zenithwiki + services: mediawiki: image: www.coastalcommits.com/zenith/mediawiki:latest @@ -6,6 +9,8 @@ services: - 8037:80 links: - database + networks: + - zenithwiki volumes: - images:/var/www/html/images - resources:/var/www/html/resources @@ -18,6 +23,8 @@ services: MYSQL_USER: zenithwikiuser MYSQL_PASSWORD: ${MYSQL_PASSWORD} MYSQL_RANDOM_ROOT_PASSWORD: 'yes' + networks: + - zenithwiki volumes: - db:/var/lib/mysql @@ -76,6 +83,8 @@ services: until curl -s -X POST --cacert config/certs/ca/ca.crt -u "elastic:${ELASTIC_PASSWORD}" -H "Content-Type: application/json" https://es01:9200/_security/user/kibana_system/_password -d "{\"password\":\"${KIBANA_PASSWORD}\"}" | grep -q "^{}"; do sleep 10; done; echo "All done!"; ' + networks: + - zenithwiki healthcheck: test: ["CMD-SHELL", "[ -f config/certs/es01/es01.crt ]"] interval: 1s @@ -87,11 +96,11 @@ services: setup: condition: service_healthy image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION} + networks: + - zenithwiki volumes: - certs:/usr/share/elasticsearch/config/certs - esdata01:/usr/share/elasticsearch/data - ports: - - 127.0.0.1:9200:9200 environment: - node.name=es01 - cluster.name=${CLUSTER_NAME} @@ -129,6 +138,8 @@ services: depends_on: - es01 image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION} + networks: + - zenithwiki volumes: - certs:/usr/share/elasticsearch/config/certs - esdata02:/usr/share/elasticsearch/data @@ -168,6 +179,8 @@ services: depends_on: - es02 image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION} + networks: + - zenithwiki volumes: - certs:/usr/share/elasticsearch/config/certs - esdata03:/usr/share/elasticsearch/data @@ -212,6 +225,8 @@ services: es03: condition: service_healthy image: docker.elastic.co/kibana/kibana:${STACK_VERSION} + networks: + - zenithwiki volumes: - certs:/usr/share/kibana/config/certs - kibanadata:/usr/share/kibana/data