diff --git a/docker-compose.lets-encrypt.yml b/docker-compose.lets-encrypt.yml index 70f28a8..74faae6 100644 --- a/docker-compose.lets-encrypt.yml +++ b/docker-compose.lets-encrypt.yml @@ -10,7 +10,7 @@ services: apache-php: labels: - - "traefik.http.routers.${CONTAINER_PREFIX}.tls.certresolver=letsencrypt" + - "traefik.http.routers.${CONTAINER_PREFIX}_php.tls.certresolver=letsencrypt" phpmyadmin: labels: diff --git a/docker-compose.yml b/docker-compose.yml index c5ecde6..42a58d1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,7 @@ services: # Configuration de Traefik traefik: image: ${TRAEFIK_IMAGE} - container_name: traefik + container_name: ${CONTAINER_PREFIX}_traefik command: - "--api.dashboard=true" - "--api.insecure=false" @@ -29,12 +29,12 @@ services: labels: - "traefik.enable=true" # - - "traefik.http.routers.${CONTAINER_PREFIX}_dashboard.rule=Host(`${TRAEFIK_URL}`)" - - "traefik.http.routers.${CONTAINER_PREFIX}_dashboard.entrypoints=websecure" - - "traefik.http.routers.${CONTAINER_PREFIX}_dashboard.service=api@internal" - - "traefik.http.routers.${CONTAINER_PREFIX}_dashboard.tls=true" - - "traefik.http.middlewares.${CONTAINER_PREFIX}_dashboard-auth.basicauth.users=${TRAEFIK_HTPASSWD}" - - "traefik.http.routers.${CONTAINER_PREFIX}_dashboard.middlewares=${CONTAINER_PREFIX}_dashboard-auth@docker" + - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.rule=Host(`${TRAEFIK_URL}`)" + - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.entrypoints=websecure" + - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.service=api@internal" + - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.tls=true" + - "traefik.http.middlewares.${CONTAINER_PREFIX}_traefik_dashboard-auth.basicauth.users=${TRAEFIK_HTPASSWD}" + - "traefik.http.routers.${CONTAINER_PREFIX}_traefik_dashboard.middlewares=${CONTAINER_PREFIX}_traefik_dashboard-auth@docker" ports: - "80:80" - "443:443" @@ -80,10 +80,10 @@ services: labels: - traefik.enable=true - traefik.docker.network=frontend - - traefik.http.routers.${CONTAINER_PREFIX}_apache.rule=Host(`${PROJECT_URL}`) - - traefik.http.routers.${CONTAINER_PREFIX}_apache.entrypoints=web - - traefik.http.routers.${CONTAINER_PREFIX}_apache.entrypoints=websecure - - traefik.http.routers.${CONTAINER_PREFIX}_apache.tls=true + - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.rule=Host(`${PROJECT_URL}`) + - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.entrypoints=web + - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.entrypoints=websecure + - traefik.http.routers.${CONTAINER_PREFIX}_apache_php.tls=true networks: - frontend - backend @@ -91,7 +91,7 @@ services: # Configuration de PHPMyAdmin phpmyadmin: restart: unless-stopped - container_name: ${CONTAINER_PREFIX} + container_name: ${CONTAINER_PREFIX}_pma image: ${PHPMYADMIN_IMAGE} depends_on: - database @@ -106,4 +106,4 @@ services: - PMA_HOST=database networks: - frontend - - backend \ No newline at end of file + - backend