wordpress-charmers team mailing list archive
-
wordpress-charmers team
-
Mailing list archive
-
Message #00298
[Merge] ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master
Thomas Cuthbert has proposed merging ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.
Commit message:
Replace readiness probe with a script that checks plugins are enabled and also that site is responsive
Requested reviews:
Canonical IS Reviewers (canonical-is-reviewers)
Wordpress Charmers (wordpress-charmers)
For more details, see:
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder/+merge/384526
--
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master into ~wordpress-charmers/charm-k8s-wordpress/+git/wordpress-k8s-image-builder:master.
diff --git a/Dockerfile b/Dockerfile
index e58cfac..5dc023c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,10 +58,12 @@ COPY ./files/_add_option.php \
./files/_enable_plugin.php \
./files/_get_option.php \
./files/plugin_handler.py \
+ ./files/ready.sh \
/srv/wordpress-helpers/
# Make the wrapper executable
RUN chmod 0755 /srv/wordpress-helpers/plugin_handler.py
+RUN chmod 0755 /srv/wordpress-helpers/ready.sh
# entrypoint script will configure Wordpress based on env variables
COPY ./files/docker-entrypoint.sh /usr/local/bin/
diff --git a/files/ready.sh b/files/ready.sh
new file mode 100644
index 0000000..878638f
--- /dev/null
+++ b/files/ready.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+READY=/srv/wordpress-helpers/.ready
+
+if [ -f "$READY" ]; then
+ /usr/bin/curl --silent http://localhost
+fi
References