makefile retrieve volumes directories from env variables

srcs/.env

@@ -1,22 +1,18 @@
 DB_HOST=mariadb
-DB_NAME=db_wp_inception
-DB_PSWD='too bad you have read this now i have to erase your memory'
-DB_USER=user_wp_inception
+DB_NAME=db_wp_jipf
+DB_PSWD='you dont want to know'
+DB_USER=user_wp_jipf
 EXECUTION_TIME=300
 HOME_PATH=/home/asususus
 HOST_VOLUME_DB=/home/asususus/data/lejourduprof/db_volume
-HOST_VOLUME_PLUGINS=/srcs/plugins
 HOST_VOLUME_WP=/home/asususus/data/lejourduprof/wp_volume
 MAX_UPLOAD_SIZE=512
 NG_VOLUME_CERTS=/etc/ssl
-WP_ADMIN_EMAIL=hulamy@42.fr
-WP_ADMIN=hulamy
+PROJECT=jipf
+WP_ADMIN=admin
+WP_ADMIN_EMAIL=admin@email.fr
 WP_ADMIN_PSWD='you shall not password !'
 WP_PORT=3003
 WP_TITLE=title
 WP_URL=local_lejourduprof.com
-WP_USER_EMAIL=moehu36@42.fr
-WP_USER=moehu36
-WP_USER_PSWD='it'\''s a secret for nobody'
 WP_VOLUME_DIR=/var/www/html
-WP_VOLUME_PLUGINS=/home/www-data

srcs/docker-compose.yml

@@ -17,14 +17,12 @@ services:
       - "${WP_PORT}:443"
     volumes:
       - wp_volume:${WP_VOLUME_DIR}
-      - wp_plugins:${WP_VOLUME_PLUGINS}
     build:
       context: ./requirements/nginx
       args:
         - WP_URL=${WP_URL}
         - MAX_UPLOAD_SIZE=${MAX_UPLOAD_SIZE}
         - WP_VOLUME_DIR=${WP_VOLUME_DIR}
-        - WP_VOLUME_PLUGINS=${WP_VOLUME_PLUGINS}
         - NG_VOLUME_CERTS=${NG_VOLUME_CERTS}
     image: nginx
     container_name: nginx_container
@@ -61,12 +59,10 @@ services:
       - inception
     volumes:
       - wp_volume:${WP_VOLUME_DIR}
-      - wp_plugins:${WP_VOLUME_PLUGINS}
     build:
       context: ./requirements/wordpress
       args:
         - WP_VOLUME_DIR=${WP_VOLUME_DIR}
-        - WP_VOLUME_PLUGINS=${WP_VOLUME_PLUGINS}
         - MAX_UPLOAD_SIZE=${MAX_UPLOAD_SIZE}
         - EXECUTION_TIME=${EXECUTION_TIME}
     image: wordpress
@@ -89,12 +85,6 @@ volumes:
       type: none
       o: "bind"
       device: ${HOST_VOLUME_WP}
-  wp_plugins:
-    driver: local
-    driver_opts:
-      type: none
-      o: "bind"
-      device: ${HOST_VOLUME_PLUGINS}
 
 networks:
   inception:

srcs/model.env

@@ -1,4 +1,6 @@
 
+PROJECT=jipf
+
 # NGINX SETUP
 
 NG_VOLUME_CERTS=/etc/ssl
@@ -7,25 +9,21 @@ MAX_UPLOAD_SIZE=512
 # MARIADB SETUP
 
 DB_HOST=mariadb
-DB_NAME=db_wp_inception
-DB_USER=user_wp_inception
-DB_PSWD="too bad you have read this now i have to erase your memory"
+DB_NAME=db_wp_${PROJECT}
+DB_USER=user_wp_${PROJECT}
+DB_PSWD="you dont want to know"
 
 # WORDPRESS SETUP
 
 WP_URL=local_lejourduprof.com
 WP_PORT=3003
 WP_VOLUME_DIR=/var/www/html
-WP_VOLUME_PLUGINS=/home/www-data
+#WP_VOLUME_PLUGINS=/home/www-data
 WP_TITLE=title
 
-WP_ADMIN=hulamy
+WP_ADMIN=admin
 WP_ADMIN_PSWD="you shall not password !"
-WP_ADMIN_EMAIL=hulamy@42.fr
-
-WP_USER=moehu36
-WP_USER_PSWD="it's a secret for nobody"
-WP_USER_EMAIL=moehu36@42.fr
+WP_ADMIN_EMAIL=admin@email.fr
 
 # MAP
 
@@ -61,5 +59,4 @@ HOME_PATH=$(eval echo "~$SUDO_USER")
 
 HOST_VOLUME_WP=${HOME_PATH}/data/lejourduprof/wp_volume
 HOST_VOLUME_DB=${HOME_PATH}/data/lejourduprof/db_volume
-HOST_VOLUME_PLUGINS=${PWD_PATH}/srcs/plugins
 

srcs/requirements/nginx/Dockerfile

@@ -24,7 +24,6 @@ RUN adduser -S www-data && \
 ARG WP_URL
 ARG MAX_UPLOAD_SIZE
 ARG WP_VOLUME_DIR
-ARG WP_VOLUME_PLUGINS
 ARG NG_VOLUME_CERTS
 
 # replace WP_URL

srcs/requirements/wordpress/Dockerfile

@@ -27,7 +27,6 @@ COPY ./conf/www.conf /etc/php7/php-fpm.d/
 RUN mkdir /run/php/
 
 ARG WP_VOLUME_DIR
-ARG WP_VOLUME_PLUGINS
 ARG MAX_UPLOAD_SIZE
 ARG EXECUTION_TIME
 

srcs/requirements/wordpress/conf/wp_entrypoint.sh

@@ -61,26 +61,16 @@ then
 		--skip-email \
 		--path="${WP_VOLUME_DIR}" --allow-root
 
-	#wp user create \
-	echo -e ${YELLOW}wp user create...${RESET}
-	php wp-cli.phar user create \
-		"${WP_USER}" "${WP_USER_EMAIL}" \
-		--user_pass="${WP_USER_PSWD}" \
-		--path="${WP_VOLUME_DIR}" --allow-root
-
 	echo -e ${YELLOW}chown and chmod...${RESET}
 	chown -R www-data:www-data /var/www/*
 	chmod 755 -R /var/www/*
 
-	echo -e ${YELLOW}plugins...${RESET}
-	plugins=$(ls ${WP_VOLUME_PLUGINS})
-	for dir in $plugins; do
-		ln -s ${WP_VOLUME_PLUGINS}/$dir ${WP_VOLUME_DIR}/wp-content/plugins/$dir
-	done
 	echo -e ${GREEN}done !${RESET}
+
 else
 	echo -e ${GREEN}wp is installed${RESET}
 
+	#https://stackoverflow.com/questions/56344567/wordpress-prevent-redirection-to-main-url
 	echo -e ${YELLOW}checking config.php file with current url...${RESET}
 	HOME=$(php wp-cli.phar config get WP_HOME --path=${WP_VOLUME_DIR})
 	if [ ${HOME} != ${COMPLETE_URL} ] ; then
@@ -93,20 +83,5 @@ else
 fi
 
 
-# HOME=$(php wp-cli.phar config get WP_HOME --path=${WP_VOLUME_DIR})
-# echo -e "HOME : ${HOME}\n"
-# SITEURL=$(php wp-cli.phar config get WP_SITEURL --path=${WP_VOLUME_DIR})
-# echo -e "SITEURL : ${SITEURL}\n"
- LIST=$(php wp-cli.phar config list --path=${WP_VOLUME_DIR} --format="dotenv")
- echo -e "LIST : ${LIST}\n"
-#
-# #DB_HOME=$(php wp-cli.phar db query "SELECT option_value FROM wp_options WHERE option_name = 'home'" --path=${WP_VOLUME_DIR})
-# #DB_HOME=$(php wp-cli.phar db query 'SELECT * FROM wp_options WHERE option_name LIKE "%home%"' --skip-column-names --path=${WP_VOLUME_DIR})
-# DB_HOME=$(php wp-cli.phar db query 'SELECT * FROM wp_options WHERE option_name="home"' --skip-column-names --path=${WP_VOLUME_DIR})
-# echo -e "DB_HOME :\n${DB_HOME}\n"
-# DB_URL=$(php wp-cli.phar db query 'SELECT * FROM wp_options WHERE option_name="siteurl"' --skip-column-names --path=${WP_VOLUME_DIR})
-# echo -e "DB_URL :\n${DB_URL}\n"
-
-
 exec "${PHP_VERSION}" -FR