Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 1e4c96d

Browse files
clean & feat: all works now
1 parent 395e51c commit 1e4c96d

File tree

10 files changed

+79
-39
lines changed

10 files changed

+79
-39
lines changed

‎srcs/.env‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,45 @@ __HOST_PORT =443
33

44
# THE PROJECT
55
__PROJECT_NAME =inception
6+
__SITE_TITLE ='Inception Blog'
7+
__SITE_URL ='https://www.jfaye.42.fr'
8+
__ADMIN_USER =supervisor
9+
__ADMIN_PASSWD =myadmin
10+
__ADMIN_EMAIL ='awesomeness@42.fr'
611

712
# MARIADB SERVICE
8-
__MARIADB_IMAGE =mariadb_i
13+
__MARIADB_IMAGE =mariadb
914
__MARIADB_CONTAINER =mariadb_c
1015
__MARIADB_CONTEXT ="./requirements/mariadb/."
1116
__DATABASE_DIR ="/var/lib/mysql/"
1217
__MARIADB_PORT =3306
18+
__SQL_ADMIN_NAME =jfaye
19+
__SQL_ADMIN_PASSWD =mypass
20+
__SQL_ROOT_PASSWD =myroot
1321
# WORDPRESS SERVICE
14-
__WORDPRESS_IMAGE =wordpress_i
22+
__WORDPRESS_IMAGE =wordpress
1523
__WORDPRESS_CONTAINER =wordpress_c
1624
__WORDPRESS_CONTEXT ="./requirements/wordpress/."
1725
__WORDPRESS_DIR ="/var/www/"
1826
__WORDPRESS_PORT =9000
27+
__WP_DB_NAME =wordpress_db
28+
__DB_HOSTNAME =mariadb
29+
__DB_HOST_PORT =$__MARIADB_PORT
1930
# NGINX SERVICE
20-
__NGINX_IMAGE =nginx_i
31+
__NGINX_IMAGE =nginx
2132
__NGINX_CONTAINER =nginx_c
2233
__NGINX_CONTEXT ="./requirements/nginx/."
2334
__NGINX_PORT =443
2435

25-
__WP_DB_NAME =wordpress_db
26-
__SQL_ADMIN_NAME =jfaye
27-
__SQL_ADMIN_PASSWD =mypass
28-
__SQL_ROOT_PASSWD =myroot
29-
__DB_HOSTNAME =mariadb
30-
__DB_HOST_PORT =$__MARIADB_PORT
36+
# SECRET PHRASES
37+
__AUTH_KEY ='NEpVtQi_QtTgB0< 8_?Rzt]]]kk2+xwD[wQch_$G,Sv56-6.JU`V+rMMyf&.`Wvb'
38+
__SECURE_AUTH_KEY ='j0~#d@+){YM#B{X~D_z1_VoOPAR?ZdZv6<Aa`3s-pYYl|v,MB*U&mD[H`FDV$]&_'
39+
__LOGGED_IN_KEY ='`8<!`M:p^~4$-q5H$||>Uf2V8AFYTq9:<6T<]rhr=H-^+-f--+x0+Z$L%h0d|XQX'
40+
__NONCE_KEY ='Gys3FQ%L^;dN+5FfmppXF?Ha:Bl5A]|}eilK`D4grT.E%F#+G;.D3-SyR;+XX[11'
41+
__AUTH_SALT ='i[T#RQHj{)J!as}_2Z?iv{jQKA?F,(5N_E6j?D^P/j,+@NX 3pFsh5pL_;;,,4P&'
42+
__SECURE_AUTH_SALT ='-r&`K0ドル_z:[;*I6|nHUO}>,-cz]WYVttF^!N1<X2(Y|2`v9:A}@PCfCH(tG?M7:i'
43+
__LOGGED_IN_SALT ='3,YdslrtZIp?NK~g9mmNo!x1}I,#|cgGM{ASL!s)2i RC[j=qAsuFzMat+|>Ep]f'
44+
__NONCE_SALT ='PDK{$],hyqrg;c/HF5av-tv>H{8xBxYmx7ドル_rl?]ZMH0=2cr0.0IAkaGL Df+?th'
3145

3246
# NETWORKS
3347
__NETWORK_NAME =inception
@@ -38,7 +52,10 @@ __WORDPRESS_DB_VOLUME ="./volumes/mariadb/"
3852

3953
# RESOLVED HOSTNAMES
4054
__RESOLVED_NETWORK_NAME =${__PROJECT_NAME}_${__NETWORK_NAME}
41-
__RESOLVED_WP_HOSTNAME =${__WORDPRESS_CONTAINER}_.${__RESOLVED_NETWORK_NAME} # "wordpress_c.inception_inception"
55+
__RESOLVED_WP_HOSTNAME =${__WORDPRESS_CONTAINER}.${__RESOLVED_NETWORK_NAME} # "wordpress.inception_inception"
4256

4357
# DEBUG
44-
__DEBUG_WP =1
58+
__DEBUG_WP =1
59+
60+
# OTHERS
61+
__HEALTH =/var/run/.health

‎srcs/docker-compose.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ services:
55
image: ${__MARIADB_IMAGE}
66
container_name: ${__MARIADB_CONTAINER}
77
pull_policy: never
8+
healthcheck: &health_authority
9+
test: ["CMD-SHELL", "test -f $__HEALTH || exit 1"]
10+
interval: 1s
11+
timeout: 10s
12+
retries: 3
813
build: ${__MARIADB_CONTEXT}
914
expose:
1015
- ${__MARIADB_PORT}
@@ -19,8 +24,11 @@ services:
1924
image: ${__WORDPRESS_IMAGE}
2025
container_name: ${__WORDPRESS_CONTAINER}
2126
depends_on:
22-
- mariadb
27+
mariadb:
28+
condition: service_healthy
29+
restart: true
2330
pull_policy: never
31+
healthcheck: *health_authority
2432
build: ${__WORDPRESS_CONTEXT}
2533
expose:
2634
- ${__WORDPRESS_PORT}
@@ -35,7 +43,9 @@ services:
3543
image: ${__NGINX_IMAGE}
3644
container_name: ${__NGINX_CONTAINER}
3745
depends_on:
38-
- wordpress
46+
wordpress:
47+
condition: service_healthy
48+
restart: true
3949
pull_policy: never
4050
build: ${__NGINX_CONTEXT}
4151
env_file: ./.env

‎srcs/requirements/mariadb/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ COPY ./tools/script.sh /etc/init.d/init_script
1010

1111
RUN chmod 500 /etc/init.d/init_script
1212

13+
RUN /etc/init.d/mariadb start
14+
1315
EXPOSE 3306
1416

1517
CMD ["/etc/init.d/init_script"]

‎srcs/requirements/mariadb/tools/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# By: TheTerror <jfaye@student.42lyon.fr> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2024年03月20日 15:35:44 by TheTerror #+# #+# #
9-
# Updated: 2024/04/01 19:21:23 by TheTerror ### ########lyon.fr #
9+
# Updated: 2024/04/02 15:59:27 by TheTerror ### ########lyon.fr #
1010
# #
1111
# **************************************************************************** #
1212

1313
IMAGE = mariadb_i
14-
CONTAINER = mariadb_c
14+
CONTAINER = mariadb
1515
PORTS = #-p 8080:443
1616
ENV = #--env-file ".env"
1717

‎srcs/requirements/mariadb/tools/script.sh‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44

55
printf "\nn\nn\ny\ny\ny\ny\n" | mysql_secure_installation
66

7-
mysql -e "CREATE DATABASE IF NOT EXISTS $__WP_DB_NAME;"
8-
9-
mysql -e "CREATE USER IF NOT EXISTS '$__SQL_ADMIN_NAME'@'localhost' \
10-
IDENTIFIED BY '$__SQL_ADMIN_PASSWD';"
11-
12-
mysql -e "GRANT ALL PRIVILEGES ON $__WP_DB_NAME.* TO \
7+
mysql -e "CREATE DATABASE IF NOT EXISTS $__WP_DB_NAME;" \
8+
-e "CREATE USER IF NOT EXISTS '$__SQL_ADMIN_NAME'@'localhost' \
9+
IDENTIFIED BY '$__SQL_ADMIN_PASSWD';" \
10+
-e "GRANT ALL PRIVILEGES ON $__WP_DB_NAME.* TO \
1311
'$__SQL_ADMIN_NAME'@'$__RESOLVED_WP_HOSTNAME' \
14-
IDENTIFIED BY '$__SQL_ADMIN_PASSWD';"
15-
16-
mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$__SQL_ROOT_PASSWD';"
17-
18-
mysql -u root -p$__SQL_ROOT_PASSWD -e "FLUSH PRIVILEGES;"
19-
12+
IDENTIFIED BY '$__SQL_ADMIN_PASSWD';" \
13+
-e "ALTER USER 'root'@'localhost' IDENTIFIED BY '$__SQL_ROOT_PASSWD';" \
14+
&& \
15+
mysql -u root -p$__SQL_ROOT_PASSWD -e "FLUSH PRIVILEGES;" \
16+
&& \
2017
mysqladmin -u root -p$__SQL_ROOT_PASSWD shutdown
2118

19+
touch $__HEALTH && chmod 400 $__HEALTH
20+
2221
mysqld

‎srcs/requirements/nginx/tools/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# By: TheTerror <jfaye@student.42lyon.fr> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2024年03月20日 15:35:44 by TheTerror #+# #+# #
9-
# Updated: 2024/04/01 19:31:44 by TheTerror ### ########lyon.fr #
9+
# Updated: 2024/04/02 15:59:42 by TheTerror ### ########lyon.fr #
1010
# #
1111
# **************************************************************************** #
1212

1313
IMAGE = nginx_i
14-
CONTAINER = nginx_c
14+
CONTAINER = nginx
1515
PORTS = -p 8080:443
1616

1717
all : build run

‎srcs/requirements/wordpress/Dockerfile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ RUN apt install php-fpm \
99
curl -y
1010

1111
RUN mkdir -p /var/www/ && \
12+
curl --output-dir /var/www -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && \
13+
chmod +x /var/www/wp-cli.phar && \
14+
mv /var/www/wp-cli.phar /usr/local/bin/wp && \
1215
curl -o /var/www/wp_package.tar.gz https://wordpress.org/latest.tar.gz && \
1316
cd /var/www/ && tar -xzf /var/www/wp_package.tar.gz && cd / && \
1417
rm -rf /var/www/wp_package.tar.gz

‎srcs/requirements/wordpress/conf/wp-config.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@
4848
*
4949
* @since 2.6.0
5050
*/
51-
define( 'AUTH_KEY', 'NEpVtQi_QtTgB0< 8_?Rzt]]]kk2+xwD[wQch_$G,Sv56-6.JU`V+rMMyf&.`Wvb' );
52-
define( 'SECURE_AUTH_KEY', 'j0~#d@+){YM#B{X~D_z1_VoOPAR?ZdZv6<Aa`3s-pYYl|v,MB*U&mD[H`FDV$]&_' );
53-
define( 'LOGGED_IN_KEY', '`8<!`M:p^~4$-q5H$||>Uf2V8AFYTq9:<6T<]rhr=H-^+-f--+x0+Z$L%h0d|XQX' );
54-
define( 'NONCE_KEY', 'Gys3FQ%L^;dN+5FfmppXF?Ha:Bl5A]|}eilK`D4grT.E%F#+G;.D3-SyR;+XX[11' );
55-
define( 'AUTH_SALT', 'i[T#RQHj{)J!as}_2Z?iv{jQKA?F,(5N_E6j?D^P/j,+@NX 3pFsh5pL_;;,,4P&' );
56-
define( 'SECURE_AUTH_SALT', '-r&`K0ドル_z:[;*I6|nHUO}>,-cz]WYVttF^!N1<X2(Y|2`v9:A}@PCfCH(tG?M7:i' );
57-
define( 'LOGGED_IN_SALT', '3,YdslrtZIp?NK~g9mmNo!x1}I,#|cgGM{ASL!s)2i RC[j=qAsuFzMat+|>Ep]f' );
58-
define( 'NONCE_SALT', 'PDK{$],hyqrg;c/HF5av-tv>H{8xBxYmx7ドル_rl?]ZMH0=2cr0.0IAkaGL Df+?th' );
51+
define( 'AUTH_KEY', getenv("__AUTH_KEY") );
52+
define( 'SECURE_AUTH_KEY', getenv("__SECURE_AUTH_KEY") );
53+
define( 'LOGGED_IN_KEY', getenv("__LOGGED_IN_KEY") );
54+
define( 'NONCE_KEY', getenv("__NONCE_KEY") );
55+
define( 'AUTH_SALT', getenv("__AUTH_SALT") );
56+
define( 'SECURE_AUTH_SALT', getenv("__SECURE_AUTH_SALT") );
57+
define( 'LOGGED_IN_SALT', getenv("__LOGGED_IN_SALT") );
58+
define( 'NONCE_SALT', getenv("__NONCE_SALT") );
5959

6060
/**#@-*/
6161

‎srcs/requirements/wordpress/Makefile‎ renamed to ‎srcs/requirements/wordpress/tools/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
# By: TheTerror <jfaye@student.42lyon.fr> +#+ +:+ +#+ #
77
# +#+#+#+#+#+ +#+ #
88
# Created: 2024年03月20日 15:35:44 by TheTerror #+# #+# #
9-
# Updated: 2024/04/01 19:31:51 by TheTerror ### ########lyon.fr #
9+
# Updated: 2024/04/02 15:59:10 by TheTerror ### ########lyon.fr #
1010
# #
1111
# **************************************************************************** #
1212

1313
IMAGE = wordpress_i
14-
CONTAINER = wordpress_c
14+
CONTAINER = wordpress
1515
PORTS = #-p 8080:443
1616

1717
all : build run
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
#!/bin/bash
2+
# sleep 10
23

34
/etc/init.d/php7.4-fpm start
5+
6+
7+
wp core install --path=/var/www/wordpress --url="$__SITE_URL" --title="$__SITE_TITLE" \
8+
--admin_user="$__ADMIN_USER" --admin_password="$__ADMIN_PASSWD" \
9+
--admin_email="$__ADMIN_EMAIL" --skip-email --allow-root
10+
411
/etc/init.d/php7.4-fpm stop
512

13+
touch $__HEALTH && chmod 400 $__HEALTH
14+
615
php-fpm7.4 -F

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /