From 288399915d3706991f779370a2721aa7412e514e Mon Sep 17 00:00:00 2001 From: Shawn Turple Date: Mon, 2 Dec 2024 07:58:03 -0800 Subject: [PATCH 1/3] DESCW-2657 update nginx to allow other containers access to local WordPress via port 38080 --- CHANGELOG.md | 4 ++++ dev/bin/commands.sh | 2 +- dev/docker-compose.yaml | 2 ++ .../templates/images/nginx/docker/local-dev.conf | 16 +++++++++++++--- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32ecf68..f21e9fb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Changelog +### December 2, 2024 +- allow access for WordPress local dev from within a local container ([DESCW-2657](https://citz-gdx.atlassian.net/browse/DESCW-2657)) +- removed $ROOT_PATH from wp command as it gave undesired results, and not required. + ### November 1, 2024 - update plugin/theme deployments ([DESCW-2691](https://citz-gdx.atlassian.net/browse/DESCW-2691)) - update images ([DESCW-2689](https://citz-gdx.atlassian.net/browse/DESCW-2689)) diff --git a/dev/bin/commands.sh b/dev/bin/commands.sh index 0ec4a8c..ea293a7 100644 --- a/dev/bin/commands.sh +++ b/dev/bin/commands.sh @@ -26,7 +26,7 @@ wp_stop() { # Access to the WordPress cli wp() { - cd $ROOT_PATH + #cd $ROOT_PATH docker exec -it dev-wp-cli-1 wp $@ } diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml index 9523632..ba21316 100644 --- a/dev/docker-compose.yaml +++ b/dev/docker-compose.yaml @@ -14,6 +14,8 @@ services: context: ../openshift/templates/images/nginx/docker ports: - 443:443 + # This is to allow access to WordPress local deployment inside another container + - 38080:38080 links: - wordpress-php-fpm depends_on: diff --git a/openshift/templates/images/nginx/docker/local-dev.conf b/openshift/templates/images/nginx/docker/local-dev.conf index 78373fe..71a44df 100644 --- a/openshift/templates/images/nginx/docker/local-dev.conf +++ b/openshift/templates/images/nginx/docker/local-dev.conf @@ -1,7 +1,18 @@ +# This is access WordPress local development from with a container, as localhost 443 does't work +server { + server_name bcgov.test; + listen 38080; + listen [::]:38080; + log_not_found off; + location / { + proxy_pass https://localhost; + } +} + server { index index.php index.html; server_name localhost; - listen 443 ssl; + listen 443 default_server ssl; listen [::]:443 ssl; error_log /dev/stderr; access_log /dev/stdout; @@ -30,8 +41,7 @@ server { stub_status on; access_log off; log_not_found off; - allow 127.0.0.1; - deny all; + } location ~ \.php$ { From f85cf3b4e5e848a8c741d8e0991340fb327b17c4 Mon Sep 17 00:00:00 2001 From: Shawn Turple Date: Mon, 2 Dec 2024 08:02:43 -0800 Subject: [PATCH 2/3] DESCW-2657 added example in nginx config --- openshift/templates/images/nginx/docker/local-dev.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openshift/templates/images/nginx/docker/local-dev.conf b/openshift/templates/images/nginx/docker/local-dev.conf index 71a44df..372902e 100644 --- a/openshift/templates/images/nginx/docker/local-dev.conf +++ b/openshift/templates/images/nginx/docker/local-dev.conf @@ -1,4 +1,5 @@ -# This is access WordPress local development from with a container, as localhost 443 does't work +# This is access WordPress local development from within a container, as localhost 443 work work +# example curl http://host.docker.internal:38080/embc/wp-json/naad/v1/alert server { server_name bcgov.test; listen 38080; From c4b41ad5d68af19ffc03aa1704abfcc7a1d817ee Mon Sep 17 00:00:00 2001 From: Shawn Turple Date: Mon, 2 Dec 2024 08:03:49 -0800 Subject: [PATCH 3/3] DESCW-2657 update grammer --- openshift/templates/images/nginx/docker/local-dev.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/templates/images/nginx/docker/local-dev.conf b/openshift/templates/images/nginx/docker/local-dev.conf index 372902e..6d75f7a 100644 --- a/openshift/templates/images/nginx/docker/local-dev.conf +++ b/openshift/templates/images/nginx/docker/local-dev.conf @@ -1,4 +1,4 @@ -# This is access WordPress local development from within a container, as localhost 443 work work +# This is to allow access to WordPress local development from within a container, as localhost 443 work work # example curl http://host.docker.internal:38080/embc/wp-json/naad/v1/alert server { server_name bcgov.test;