From 6be941be7838acf268e45ab875e6c351a8e6f5ba Mon Sep 17 00:00:00 2001
From: asus <asus@example.com>
Date: Sun, 3 Sep 2023 18:16:13 +0200
Subject: [PATCH] resolve bug wp-cli.phar

---
 srcs/requirements/wordpress/Dockerfile        |  4 +-
 .../wordpress/conf/wp_entrypoint.sh           | 68 ++++---------------
 2 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/srcs/requirements/wordpress/Dockerfile b/srcs/requirements/wordpress/Dockerfile
index 1e83a01..05bf066 100644
--- a/srcs/requirements/wordpress/Dockerfile
+++ b/srcs/requirements/wordpress/Dockerfile
@@ -46,9 +46,11 @@ RUN adduser -S www-data && \
 ENV PHP_VERSION="php-fpm7"
 
 # install wp-cli : https://wp-cli.org/#installing
+# bug with wp commands : https://github.com/wp-cli/config-command/issues/31
+#		change : mv wp-cli.phar /usr/local/bin/wp -> cp wp-cli.phar /usr/local/bin/wp
 RUN curl -O https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar &&\
 	chmod +x wp-cli.phar && \
-	mv wp-cli.phar /usr/local/bin/wp
+	cp wp-cli.phar /usr/local/bin/wp
 
 COPY ./conf/wp_entrypoint.sh ./
 
diff --git a/srcs/requirements/wordpress/conf/wp_entrypoint.sh b/srcs/requirements/wordpress/conf/wp_entrypoint.sh
index 461ade5..6fe66a3 100644
--- a/srcs/requirements/wordpress/conf/wp_entrypoint.sh
+++ b/srcs/requirements/wordpress/conf/wp_entrypoint.sh
@@ -12,81 +12,36 @@ RESET="\e[0m"
 
 # install wordpress with cli : https://make.wordpress.org/cli/handbook/how-to-install/
 # commands : https://developer.wordpress.org/cli/commands/
+# bug with wp commands : https://github.com/wp-cli/config-command/issues/31
+#		-> use `php wp-cli.phar` instead of `wp` as command
 
 echo -e ${YELLOW}download wordpress :${RESET}
 if ! wp core version --path="${WP_VOLUME_DIR}" 2> /dev/null
 then
-	echo -e ${YELLOW}-> wordpress version${RESET}
+	echo -e ${YELLOW}wp core download...${RESET}
 	mkdir -p ${WP_VOLUME_DIR}
-		wp core download --path="${WP_VOLUME_DIR}" --allow-root
+		#wp core download --path="${WP_VOLUME_DIR}" --allow-root
+		php wp-cli.phar core download --path="${WP_VOLUME_DIR}" --allow-root
 else
 	echo -e ${GREEN}already there !${RESET}
 fi
 
-#	# create config file :
-#	echo -e ${YELLOW}config wordpress :${RESET}
-#	if ! wp config path --path="${WP_VOLUME_DIR}" --quiet 2> /dev/null
-#	then
-#		wp config create \
-#			--dbhost="${DB_HOST}" \
-#			--dbname="${DB_NAME}" \
-#			--dbuser="${DB_USER}" \
-#			--dbpass="${DB_PSWD}" \
-#			--path="${WP_VOLUME_DIR}" --allow-root
-#	else
-#		echo -e ${GREEN}already configured !${RESET}
-#	fi
-#	
-#	# install wordpress :
-#	echo -e ${YELLOW}install wordpress :${RESET}
-#	if ! wp core is-installed --path="${WP_VOLUME_DIR}" 2> /dev/null
-#	then
-#		wp core install \
-#			--url="${WP_URL}" \
-#			--title="${WP_TITLE}" \
-#			--admin_user="${WP_ADMIN}" \
-#			--admin_email="${WP_ADMIN_EMAIL}" \
-#			--admin_password="${WP_ADMIN_PSWD}" \
-#			--skip-email \
-#			--path="${WP_VOLUME_DIR}" --allow-root
-#	else
-#		echo -e ${GREEN}already installed !${RESET}
-#	fi
-#	
-#	# create user :
-#	echo -e ${YELLOW}create wordpress user :${RESET}
-#	if ! wp user get ${WP_USER} --path="${WP_VOLUME_DIR}" --field=login 2> /dev/null
-#	then
-#		wp user create \
-#			"${WP_USER}" "${WP_USER_EMAIL}" \
-#			--user_pass="${WP_USER_PSWD}" \
-#			--path="${WP_VOLUME_DIR}" --allow-root
-#	else
-#		echo -e ${GREEN}already created !${RESET}
-#	fi
-#	
-#	# change owner and permissions to wp files
-#	chown -R www-data:www-data /var/www/*
-#	chmod 755 -R /var/www/*
-#	
-#	# symlinks for folders found in host plugins/
-#	plugins=$(ls ${WP_VOLUME_PLUGINS})
-#	for dir in $plugins; do
-#		ln -s ${WP_VOLUME_PLUGINS}/$dir ${WP_VOLUME_DIR}/wp-content/plugins/$dir
-#	done
+
 
 if ! wp core is-installed --path="${WP_VOLUME_DIR}" 2> /dev/null
 then
 	echo -e ${YELLOW}installing...${RESET}
 	echo -e ${YELLOW}wp config create...${RESET}
-	wp config create \
+	#wp config create \
+	php wp-cli.phar config create \
 		--dbhost="${DB_HOST}" \
 		--dbname="${DB_NAME}" \
 		--dbuser="${DB_USER}" \
 		--dbpass="${DB_PSWD}" \
 		--path="${WP_VOLUME_DIR}" --allow-root
 	echo -e ${YELLOW}wp core install...${RESET}
-	wp core install \
+	#wp core install \
+	php wp-cli.phar core install \
 		--url="${WP_URL}" \
 		--title="${WP_TITLE}" \
 		--admin_user="${WP_ADMIN}" \
@@ -95,7 +50,8 @@ then
 		--skip-email \
 		--path="${WP_VOLUME_DIR}" --allow-root
 	echo -e ${YELLOW}wp user create...${RESET}
-	wp user create \
+	#wp user create \
+	php wp-cli.phar user create \
 		"${WP_USER}" "${WP_USER_EMAIL}" \
 		--user_pass="${WP_USER_PSWD}" \
 		--path="${WP_VOLUME_DIR}" --allow-root