diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yaml index 3d31b39..af39c75 100644 --- a/nextcloud/docker-compose.yaml +++ b/nextcloud/docker-compose.yaml @@ -46,9 +46,6 @@ services: depends_on: - db - redis - labels: - - "docker.group=netxtcloud" - db: image: mariadb:10 diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index 2ccacce..d0bfec2 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -16,9 +16,8 @@ services: - "--providers.docker=true" - "--providers.docker.exposedbydefault=false" - "--providers.docker.network=web" - - "--providers.docker.endpoint=tcp://docker-socket-proxy:2375" #- "--log.level=DEBUG" - #- "--accesslog=true" + - "--accesslog=true" - "--entrypoints.web.address=:80" - "--entrypoints.web.http.redirections.entrypoint.to=websecure" - "--entrypoints.web.http.redirections.entrypoint.scheme=https" @@ -34,8 +33,8 @@ services: - "443:443" networks: - web - - proxy volumes: + - "/var/run/docker.sock:/var/run/docker.sock:ro" - ${VOLUMES_PATH}/letsencrypt:/letsencrypt - $PWD/tls.toml:/etc/traefik/tls.toml labels: @@ -51,16 +50,6 @@ services: - "traefik.http.middlewares.auth.basicauth.users=${HTPASSWD}" - "docker.group=proxy" - docker-socket-proxy: - image: tecnativa/docker-socket-proxy - restart: unless-stopped - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - environment: - CONTAINERS: 1 - networks: - - proxy - # whoami: # image: containous/whoami @@ -78,4 +67,4 @@ services: networks: web: external: true - proxy: +