diff --git a/.env.example b/.env.example index fb4c7a0..dc81ac0 100644 --- a/.env.example +++ b/.env.example @@ -9,7 +9,7 @@ COMPOSE_FILE_MEMCACHED="docker/docker-compose.memcached.yml" COMPOSE_FILE_REDIS="docker/docker-compose.redis.yml" COMPOSE_FILE_CRON="docker/docker-compose.cron.yml" COMPOSE_FILE_UPLOAD="docker/docker-compose.upload.yml" -COMPOSE_FILE_MAILOG="docker/docker-compose.mailhog.yml" +COMPOSE_FILE_MAILPIT="docker/docker-compose.mailpit.yml" COMPOSE_FILE_DEV="docker/docker-compose.dev.yml" COMPOSE_FILE_LETS_ENCRYPT="docker/docker-compose.lets-encrypt.yml" @@ -21,7 +21,7 @@ COMPOSE_FILE="${COMPOSE_FILE_BASE}" COMPOSE_FILE_SERVER_PHP="${COMPOSE_FILE_APACHE}" # Exemple complet en local -# COMPOSE_FILE="${COMPOSE_FILE_BASE}:${COMPOSE_FILE_SERVER_PHP}:${COMPOSE_FILE_MEMCACHED}:{COMPOSE_FILE_REDIS}:${COMPOSE_FILE_CRON}:${COMPOSE_FILE_UPLOAD}:${COMPOSE_FILE_MAILOG}:${COMPOSE_FILE_DEV}" +# COMPOSE_FILE="${COMPOSE_FILE_BASE}:${COMPOSE_FILE_SERVER_PHP}:${COMPOSE_FILE_MEMCACHED}:{COMPOSE_FILE_REDIS}:${COMPOSE_FILE_CRON}:${COMPOSE_FILE_UPLOAD}:${COMPOSE_FILE_MAILPIT}:${COMPOSE_FILE_DEV}" # Pour utiliser Let's Encrypt : # COMPOSE_FILE="${COMPOSE_FILE_BASE}:${COMPOSE_FILE_LETS_ENCRYPT}" @@ -73,8 +73,8 @@ OPCACHE_CONFIG_FILE="opcache.dev.ini" PHPMYADMIN_IMAGE="phpmyadmin:5.2-apache" PHPMYADMIN_URL="" -# Mail Hog -MAILHOG_URL="" +# Mailpit (interface mail en développement) +MAILPIT_URL="" # Configuration en local VITE_PORT="8888" \ No newline at end of file diff --git a/docker/docker-compose.mailhog.yml b/docker/docker-compose.mailhog.yml deleted file mode 100644 index 0d3d76c..0000000 --- a/docker/docker-compose.mailhog.yml +++ /dev/null @@ -1,15 +0,0 @@ -services: - - mailhog: - restart: unless-stopped - container_name: ${CONTAINER_PREFIX}_mailhog - image: mailhog/mailhog:latest - logging: - driver: 'none' - labels: - - traefik.enable=true - - traefik.http.routers.${CONTAINER_PREFIX}_mailhog.rule=Host(`${MAILHOG_URL}`) - - traefik.http.routers.${CONTAINER_PREFIX}_mailhog.entrypoints=websecure - - traefik.http.services.${CONTAINER_PREFIX}_mailhog.loadbalancer.server.port=8025 - networks: - - frontend \ No newline at end of file diff --git a/docker/docker-compose.mailpit.yml b/docker/docker-compose.mailpit.yml new file mode 100644 index 0000000..5271949 --- /dev/null +++ b/docker/docker-compose.mailpit.yml @@ -0,0 +1,15 @@ +services: + + mailpit: + restart: unless-stopped + container_name: ${CONTAINER_PREFIX}_mailpit + image: axllent/mailpit:latest + logging: + driver: "none" + labels: + - traefik.enable=true + - traefik.http.routers.${CONTAINER_PREFIX}_mailpit.rule=Host(`${MAILPIT_URL}`) + - traefik.http.routers.${CONTAINER_PREFIX}_mailpit.entrypoints=websecure + - traefik.http.services.${CONTAINER_PREFIX}_mailpit.loadbalancer.server.port=8025 + networks: + - frontend \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9b8576b..3b63519 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -27,6 +27,7 @@ services: server-php: restart: unless-stopped container_name: ${CONTAINER_PREFIX}_server_php + hostname: ${PROJECT_URL} build: context: ${PWD}