Browse Source

nettoyage

Jackbot 2 years ago
parent
commit
7d0bfdbd7b
3 changed files with 12 additions and 39 deletions
  1. 2 2
      default.env
  2. 8 35
      docker-compose.yml
  3. 2 2
      override.env

+ 2 - 2
default.env

@@ -1,3 +1,3 @@
-COMPOSE_PROJECT_NAME=traefik
+COMPOSE_PROJECT_NAME=solidus
 DOCKER_HOST=ssh://root@jackbot.fr
-APP_FQDN=traefik.domain
+APP_FQDN=solidus.domain

+ 8 - 35
docker-compose.yml

@@ -1,46 +1,19 @@
 version: '3.7'
 
 services:
-  reverse-proxy:
+  solidus:
     # The official v2 Traefik docker image
     image: traefik:v2.3
-    container_name: traefik_reverse-proxy
+    container_name: solidus
     restart: always
-    # Enables the web UI and tells Traefik to listen to docker
-    command:
-      - "--api.insecure=true"
-      - "--providers.docker"
-      - "--providers.docker.exposedbydefault=false"
-      - "--providers.docker.network=traefik_default"
-      - "--entrypoints.web.address=:80"
-      - "--entrypoints.websecure.address=:443"
     ports:
-      # The HTTP port
-#      - "80:80"
-      # The HTTPS port
-#      - "443:443"
-      # The Web UI (enabled by --api.insecure=true)
-      - "8084:8080"
+      - "8085:8080"
     volumes:
-      # So that Traefik can listen to the Docker events
-      - /var/run/docker.sock:/var/run/docker.sock
-#      - /home/jack/volumes/traefik/traefik.toml:/etc/traefik/traefik.toml
-#      - /home/jack/volumes/traefik/services.toml:/etc/traefik/services/services.toml
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.dashboard.rule=Host(`traefik.jackbot.fr`)"
-      - "traefik.http.routers.dashboard.entrypoints=web"
-      - "traefik.http.services.dashboard.loadbalancer.server.port=8080"
-      - "traefik.docker.network=traefik_default"
-      - "traefik.http.middlewares.test-ipwhitelist.ipwhitelist.sourcerange=127.0.0.1/32, 192.168.1.30"
-#    - "traefik.http.routers.api.service=api@internal"
-#    - "traefik.http.routers.api.entrypoints=web"
-#    - "traefik.http.routers.api.middlewares=auth"
-#    - "traefik.http.middlewares.auth.basicauth.users=Jack:$apr1$VteRdqde$Q1o/Z5x2cUBtIhK4/6xfS0"
+#      - /home/jack/volumes/solidus/:/etc/
     networks:
-      - traefik_default
-      - default
+        - conf_conteneurs_services_web
 
 networks:
-  traefik_default:
-#    external: true
+  dolibarr:
+  conf_conteneurs_services_web:
+    external: true

+ 2 - 2
override.env

@@ -1,2 +1,2 @@
-DOCKER_HOST=ssh://root@192.168.1.16
-APP_FQDN=traefik.domain
+DOCKER_HOST=ssh://root@192.168.1.15
+APP_FQDN=solidus.domain