diff --git a/services/bootstrap/docker-compose.yml b/services/bootstrap/docker-compose.yml index aa2df81..7b5df4a 100644 --- a/services/bootstrap/docker-compose.yml +++ b/services/bootstrap/docker-compose.yml @@ -1,18 +1,6 @@ name: bootstrap services: - docker: - hostname: docker - image: alpine/socat - command: tcp-listen:2375,fork,reuseaddr unix-connect:/var/run/docker.sock - networks: - - docker - volumes: - - /var/run/docker.sock:/var/run/docker.sock - restart: unless-stopped - labels: - nas-compose.boostrap: true - portainer: hostname: portainer image: portainer/portainer-ce @@ -21,9 +9,8 @@ services: --hide-label nas-compose.boostrap=true --admin-password-file /run/secrets/portainer_password user: ${NASCOMPOSE_UID?}:${NASCOMPOSE_GID?} - networks: - - docker volumes: + - /var/run/docker.sock:/var/run/docker.sock - /var/packages/ContainerManager/var/docker/volumes/:/var/lib/docker/volumes/ - ${NASCOMPOSE_SERVICES?}/bootstrap/volumes/portainer_data/:/data/ # Secrets @@ -33,9 +20,3 @@ services: restart: unless-stopped labels: nas-compose.boostrap: true - -networks: - docker: - name: docker - labels: - nas-compose.boostrap: true diff --git a/services/docker-monitoring/docker-compose.yml b/services/docker-monitoring/docker-compose.yml index 2afc510..7330379 100644 --- a/services/docker-monitoring/docker-compose.yml +++ b/services/docker-monitoring/docker-compose.yml @@ -10,13 +10,8 @@ services: WATCHTOWER_INCLUDE_STOPPED: true WATCHTOWER_NOTIFICATION_REPORT: true WATCHTOWER_NOTIFICATION_URL: /run/secrets/watchtower_notification_url - networks: - - docker volumes: + - /var/run/docker.sock:/var/run/docker.sock # Secrets - ${NASCOMPOSE_SERVICES?}/docker-monitoring/secrets/notification_url:/run/secrets/watchtower_notification_url:ro restart: unless-stopped - -networks: - docker: - external: true