42_adjoly/inception
1
0
Fork 0
Code

「🔨」 fix: Fixed a few things

Browse Source
This commit is contained in:
keyzox
2025-03-06 09:28:20 +01:00
parent ddf4f85937
commit f9759c31fa
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
srcs/docker-compose.yml
View File

@ -51,7 +51,7 @@ services:
networks: networks:
- inception - inception
environment: 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_KEY_FILE=/etc/nginx/ssl/adjoly-wp.key
- NGINX_SSL_CERT_FILE=/etc/nginx/ssl/adjoly-wp.crt - NGINX_SSL_CERT_FILE=/etc/nginx/ssl/adjoly-wp.crt
depends_on: depends_on:
@ -69,7 +69,7 @@ services:
restart: unless-stopped restart: unless-stopped
wordpress-php: wordpress-php:
container_name: inception-wordp-php container_name: inception-wordpress-php
build: build:
context: . context: .
dockerfile: docker/wordpress/Dockerfile dockerfile: docker/wordpress/Dockerfile
@ -84,7 +84,7 @@ services:
- WP_DB_PASS_FILE=/run/secrets/user-db-pass - WP_DB_PASS_FILE=/run/secrets/user-db-pass
- WP_DB_HOST=db - WP_DB_HOST=db
- WP_ADMIN_EMAIL=${WP_MAIL} - 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_ADMIN_PASS_FILE=/run/secrets/wp-admin-pass
- WP_URL=adjoly.42.fr - WP_URL=adjoly.42.fr
- WP_TITLE=Kanel Supremacy - WP_TITLE=Kanel Supremacy
@ -125,7 +125,7 @@ services:
build: docker/bonus/static-site build: docker/bonus/static-site
container_name: inception-kanel-supremacy container_name: inception-kanel-supremacy
ports: ports:
- 8080:443 - 8443:443
depends_on: depends_on:
- nginx - nginx
environment: environment:
@ -168,7 +168,7 @@ services:
networks: networks:
- inception - inception
ports: ports:
- 8090:8080 - 8080:8080
depends_on: depends_on:
db: db:
condition: service_healthy condition: service_healthy

2
srcs/docker/bonus/adminer/Dockerfile
View File

@ -28,4 +28,4 @@ STOPSIGNAL SIGINT
USER adminer USER adminer
CMD [ "php84", "-S", "0.0.0.0:8080", "-t", "/var/www/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"

2
srcs/docker/mariadb/Dockerfile
View File

@ -46,4 +46,4 @@ WORKDIR /var/lib/mysql
EXPOSE 3306 EXPOSE 3306
CMD [ "mariadbd", "--user=mysql" ] 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

2
srcs/docker/nginx/Dockerfile
View File

@ -45,4 +45,4 @@ STOPSIGNAL SIGQUIT
EXPOSE 80 EXPOSE 80
CMD [ "nginx", "-g", "daemon off;" ] 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

2
srcs/docker/wordpress/Dockerfile
View File

@ -67,4 +67,4 @@ STOPSIGNAL SIGQUIT
EXPOSE 9000 EXPOSE 9000
CMD [ "php-fpm84", "-F" ] 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