diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml index 63a0ae1..7c2ad01 100644 --- a/srcs/docker-compose.yml +++ b/srcs/docker-compose.yml @@ -51,7 +51,7 @@ services: networks: - inception environment: - - NGINX_PHP_HOST=inception-wordp-php + - NGINX_PHP_HOST=inception-wordpress-php - NGINX_SSL_KEY_FILE=/etc/nginx/ssl/adjoly-wp.key - NGINX_SSL_CERT_FILE=/etc/nginx/ssl/adjoly-wp.crt depends_on: @@ -69,7 +69,7 @@ services: restart: unless-stopped wordpress-php: - container_name: inception-wordp-php + container_name: inception-wordpress-php build: context: . dockerfile: docker/wordpress/Dockerfile @@ -84,7 +84,7 @@ services: - WP_DB_PASS_FILE=/run/secrets/user-db-pass - WP_DB_HOST=db - WP_ADMIN_EMAIL=${WP_MAIL} - - WP_ADMIN_USER=${WP_USER} + - WP_ADMIN_USER=${WP_ADMIN} - WP_ADMIN_PASS_FILE=/run/secrets/wp-admin-pass - WP_URL=adjoly.42.fr - WP_TITLE=Kanel Supremacy @@ -125,7 +125,7 @@ services: build: docker/bonus/static-site container_name: inception-kanel-supremacy ports: - - 8080:443 + - 8443:443 depends_on: - nginx environment: @@ -168,7 +168,7 @@ services: networks: - inception ports: - - 8090:8080 + - 8080:8080 depends_on: db: condition: service_healthy diff --git a/srcs/docker/bonus/adminer/Dockerfile b/srcs/docker/bonus/adminer/Dockerfile index 041b13c..7e3465a 100644 --- a/srcs/docker/bonus/adminer/Dockerfile +++ b/srcs/docker/bonus/adminer/Dockerfile @@ -28,4 +28,4 @@ STOPSIGNAL SIGINT USER adminer CMD [ "php84", "-S", "0.0.0.0:8080", "-t", "/var/www/adminer"] -HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=1s --start-interval=2s CMD curl -f "http://localhost:8080" +HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=30s --start-interval=5s CMD curl -f "http://localhost:8080" diff --git a/srcs/docker/mariadb/Dockerfile b/srcs/docker/mariadb/Dockerfile index 54ff97f..b0fc9e2 100644 --- a/srcs/docker/mariadb/Dockerfile +++ b/srcs/docker/mariadb/Dockerfile @@ -46,4 +46,4 @@ WORKDIR /var/lib/mysql EXPOSE 3306 CMD [ "mariadbd", "--user=mysql" ] -HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=8s --start-interval=2s CMD /docker-healthcheck +HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=60s --start-interval=5s CMD /docker-healthcheck diff --git a/srcs/docker/nginx/Dockerfile b/srcs/docker/nginx/Dockerfile index adef5a9..4bda2f3 100644 --- a/srcs/docker/nginx/Dockerfile +++ b/srcs/docker/nginx/Dockerfile @@ -45,4 +45,4 @@ STOPSIGNAL SIGQUIT EXPOSE 80 CMD [ "nginx", "-g", "daemon off;" ] -HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=3s --start-interval=2s CMD curl http://127.0.0.1:80/health || exit 1 +HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=60s --start-interval=5s CMD curl http://127.0.0.1:80/health || exit 1 diff --git a/srcs/docker/wordpress/Dockerfile b/srcs/docker/wordpress/Dockerfile index db77683..cff1561 100644 --- a/srcs/docker/wordpress/Dockerfile +++ b/srcs/docker/wordpress/Dockerfile @@ -67,4 +67,4 @@ STOPSIGNAL SIGQUIT EXPOSE 9000 CMD [ "php-fpm84", "-F" ] -HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=7s --start-interval=2s CMD cgi-fcgi -bind -connect 127.0.0.1:${PHP_PORT:-9000} || exit 1 +HEALTHCHECK --interval=30s --timeout=10s --retries=3 --start-period=60s --start-interval=5s CMD cgi-fcgi -bind -connect 127.0.0.1:${PHP_PORT:-9000} || exit 1