From 83ae7f0bd0687eb6cd57d5bec7ef30ed8ecfbd8b Mon Sep 17 00:00:00 2001 From: David <4847899+davidwuest@users.noreply.github.com> Date: Tue, 11 Mar 2025 19:46:35 +0100 Subject: [PATCH 1/8] Add files via upload --- wp-cli.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 wp-cli.yml diff --git a/wp-cli.yml b/wp-cli.yml new file mode 100644 index 00000000..28952293 --- /dev/null +++ b/wp-cli.yml @@ -0,0 +1,2 @@ +# This file is used by the wp-cli tool to define the path to the WordPress installation +path: /usr/src/wordpress \ No newline at end of file From 687660573bb31a713204178fb1bf227a53a978af Mon Sep 17 00:00:00 2001 From: David <4847899+davidwuest@users.noreply.github.com> Date: Tue, 11 Mar 2025 19:48:32 +0100 Subject: [PATCH 2/8] add wp-cli.yml to dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 65414744..5eb98e43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -71,7 +71,7 @@ RUN curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh && chmod +x /usr/local/bin/wp # WP config -COPY --chown=nobody:nobody wp-config.php /usr/src/wordpress +COPY --chown=nobody:nobody wp-config.php wp-cli.yml /usr/src/wordpress RUN chmod 640 /usr/src/wordpress/wp-config.php # Link wp-secrets to location on wp-content From 880c49e92aaa61697d4f648f435e897cd505f8e0 Mon Sep 17 00:00:00 2001 From: David <4847899+davidwuest@users.noreply.github.com> Date: Tue, 11 Mar 2025 19:54:33 +0100 Subject: [PATCH 3/8] Add WP CLI Configuration --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 1441573b..548521ce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,6 +24,7 @@ services: DB_USER: wordpress WORDPRESS_SITE_URL: http://localhost:8123 FS_METHOD: direct + WP_CLI_CONFIG_PATH: /usr/src/wordpress/wp-cli.yml # WP CLI Configuration # For debugging only: #WP_DEBUG: "true" #WP_DEBUG_DISPLAY: "true" From 9b746e82b5895aa649c61350862b38d30f709472 Mon Sep 17 00:00:00 2001 From: David <4847899+davidwuest@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:00:56 +0100 Subject: [PATCH 4/8] Update location of wp-cli config --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5eb98e43..18ffdf8a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,9 +69,10 @@ RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_VER # Add WP CLI RUN curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \ && chmod +x /usr/local/bin/wp +COPY --chown=nobody:nobody wp-cli.yml /usr/local/bin/ # WP config -COPY --chown=nobody:nobody wp-config.php wp-cli.yml /usr/src/wordpress +COPY --chown=nobody:nobody wp-config.php /usr/src/wordpress RUN chmod 640 /usr/src/wordpress/wp-config.php # Link wp-secrets to location on wp-content From 58a60ca9c6ec13d97b07e560a800234fbbd97761 Mon Sep 17 00:00:00 2001 From: David <4847899+davidwuest@users.noreply.github.com> Date: Mon, 17 Mar 2025 20:02:36 +0100 Subject: [PATCH 5/8] Remove wp-cli config env --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 548521ce..1441573b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,6 @@ services: DB_USER: wordpress WORDPRESS_SITE_URL: http://localhost:8123 FS_METHOD: direct - WP_CLI_CONFIG_PATH: /usr/src/wordpress/wp-cli.yml # WP CLI Configuration # For debugging only: #WP_DEBUG: "true" #WP_DEBUG_DISPLAY: "true" From b6771ac1c63402646d4bcd153a4a225ed7f5f866 Mon Sep 17 00:00:00 2001 From: David <4847899+davidwuest@users.noreply.github.com> Date: Mon, 17 Mar 2025 22:22:53 +0100 Subject: [PATCH 6/8] Update wp-cli config path --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 18ffdf8a..e77ad5f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,7 @@ RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_VER # Add WP CLI RUN curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \ && chmod +x /usr/local/bin/wp -COPY --chown=nobody:nobody wp-cli.yml /usr/local/bin/ +COPY --chown=nobody:nobody wp-cli.yml /usr/src/wordpress/ # WP config COPY --chown=nobody:nobody wp-config.php /usr/src/wordpress From edfea2bd8d667347d5fd4e4db9adcf9f77b20fa9 Mon Sep 17 00:00:00 2001 From: DavidWuest Date: Mon, 17 Mar 2025 23:02:45 +0100 Subject: [PATCH 7/8] Add wp-cli.yml setup in entrypoint script --- entrypoint.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/entrypoint.sh b/entrypoint.sh index 2e87dac0..db0cddfd 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,6 +10,12 @@ if [ ! "$(ls -A "/var/www/wp-content" 2>/dev/null)" ]; then cp -r /usr/src/wordpress/wp-content /var/www/ chown -R nobody:nobody /var/www fi +if ! [ -f "/var/www/wp-content/wp-cli.yml" ]; then + echo 'Setting up wp-cli.yml' + # Copy wp-cli.yml from Wordpress src to volume + cp /usr/src/wordpress/wp-cli.yml /var/www/wp-content/ + chown nobody:nobody /var/www/wp-content/wp-cli.yml +fi # Check if wp-secrets.php exists if ! [ -f "/var/www/wp-content/wp-secrets.php" ]; then echo ' /var/www/wp-content/wp-secrets.php From d42985228e4727e0c795dc4ec07e3fcb97249aa8 Mon Sep 17 00:00:00 2001 From: Tim de Pater Date: Sun, 23 Mar 2025 07:40:22 +0100 Subject: [PATCH 8/8] Move ENV to Dockerfile --- Dockerfile | 1 + entrypoint.sh | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index e77ad5f5..aa8fb293 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,7 @@ RUN curl -o wordpress.tar.gz -SL https://wordpress.org/wordpress-${WORDPRESS_VER && chown -R nobody:nobody /usr/src/wordpress # Add WP CLI +ENV WP_CLI_CONFIG_PATH /usr/src/wordpress/wp-cli.yml RUN curl -o /usr/local/bin/wp https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar \ && chmod +x /usr/local/bin/wp COPY --chown=nobody:nobody wp-cli.yml /usr/src/wordpress/ diff --git a/entrypoint.sh b/entrypoint.sh index db0cddfd..2e87dac0 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -10,12 +10,6 @@ if [ ! "$(ls -A "/var/www/wp-content" 2>/dev/null)" ]; then cp -r /usr/src/wordpress/wp-content /var/www/ chown -R nobody:nobody /var/www fi -if ! [ -f "/var/www/wp-content/wp-cli.yml" ]; then - echo 'Setting up wp-cli.yml' - # Copy wp-cli.yml from Wordpress src to volume - cp /usr/src/wordpress/wp-cli.yml /var/www/wp-content/ - chown nobody:nobody /var/www/wp-content/wp-cli.yml -fi # Check if wp-secrets.php exists if ! [ -f "/var/www/wp-content/wp-secrets.php" ]; then echo ' /var/www/wp-content/wp-secrets.php