diff --git a/home/bin/ws.service b/home/bin/ws.service index 53db28f0..85896a0b 100755 --- a/home/bin/ws.service +++ b/home/bin/ws.service @@ -22,9 +22,12 @@ bootstrap() DIR="$(cd "$(dirname "$0")" && cd ../ && pwd)" # shellcheck source=../lib/sidekick.sh source "$DIR/lib/sidekick.sh" + if ! docker network ls -f name="${TRAEFIK_NETWORK}" | grep -q "${TRAEFIK_NETWORK}"; then + run docker network create "${TRAEFIK_NETWORK}" + fi - if ! docker network ls | grep "${TRAEFIK_NETWORK}" > /dev/null; then - run docker network create "$TRAEFIK_NETWORK" + if ! docker network ls -f name="${TRAEFIK_NETWORK}_monitoring" | grep -q "${TRAEFIK_NETWORK}_monitoring"; then + run docker network create "${TRAEFIK_NETWORK}_monitoring" fi } diff --git a/home/service/logger/docker-compose.yml b/home/service/logger/docker-compose.yml index 6be34258..a0cfb6e1 100644 --- a/home/service/logger/docker-compose.yml +++ b/home/service/logger/docker-compose.yml @@ -5,16 +5,16 @@ services: kibana: build: context: kibana - depends_on: - - elasticsearch + links: + - elasticsearch:elasticsearch labels: - traefik.backend=kibana - traefik.frontend.rule=Host:kibana.my127.site - traefik.docker.network=${TRAEFIK_NETWORK} - traefik.port=5601 networks: - - shared - private + - shared elasticsearch: build: @@ -56,7 +56,7 @@ services: - traefik.enable=false networks: - private - - shared + - monitoring volumes: filebeat_data: ~ @@ -64,6 +64,9 @@ volumes: networks: private: external: false + monitoring: + external: + name: ${TRAEFIK_NETWORK}_monitoring shared: external: - name: $TRAEFIK_NETWORK + name: ${TRAEFIK_NETWORK} diff --git a/home/service/proxy/docker-compose.yml b/home/service/proxy/docker-compose.yml index 35ce073e..61b69228 100644 --- a/home/service/proxy/docker-compose.yml +++ b/home/service/proxy/docker-compose.yml @@ -18,6 +18,7 @@ services: networks: - private - shared + - monitoring command: ['--docker'] networks: private: @@ -25,3 +26,6 @@ networks: shared: external: name: $TRAEFIK_NETWORK + monitoring: + external: + name: ${TRAEFIK_NETWORK}_monitoring