wordpress-charmers team mailing list archive

[Thomas Cuthbert <mp+406893@xxxxxxxxxxxxxxxxxx>]

Thomas Cuthbert has proposed merging ~tcuthbert/charm-k8s-wordpress:kubuntu-org into charm-k8s-wordpress:master.

Commit message:
Updates to docker container for kubuntu.org

Requested reviews:
  Wordpress Charmers (wordpress-charmers)

For more details, see:
https://code.launchpad.net/~tcuthbert/charm-k8s-wordpress/+git/charm-k8s-wordpress-1/+merge/406893
-- 
Your team Wordpress Charmers is requested to review the proposed merge of ~tcuthbert/charm-k8s-wordpress:kubuntu-org into charm-k8s-wordpress:master.

diff --git a/Dockerfile b/Dockerfile
index 8d92b92..d6980d2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,6 +29,7 @@ RUN apt-get update && apt-get -y dist-upgrade \
             php-curl \
             php-gd \
             php-gmp \
+            php-mbstring \
             php-mysql \
             php-symfony-yaml \
             php-xml \
diff --git a/image-builder/files/docker-entrypoint.sh b/image-builder/files/docker-entrypoint.sh
index 42caf39..8b9630f 100644
--- a/image-builder/files/docker-entrypoint.sh
+++ b/image-builder/files/docker-entrypoint.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -eu
 
+printf "remove_filter('template_redirect', 'redirect_canonical');" >> /var/www/html/wp-includes/functions.php
+
 sed -i -e "s/%%%WORDPRESS_DB_HOST%%%/$WORDPRESS_DB_HOST/" /var/www/html/wp-info.php
 sed -i -e "s/%%%WORDPRESS_DB_NAME%%%/$WORDPRESS_DB_NAME/" /var/www/html/wp-info.php
 sed -i -e "s/%%%WORDPRESS_DB_USER%%%/$WORDPRESS_DB_USER/" /var/www/html/wp-info.php
diff --git a/image-builder/files/wp-config.php b/image-builder/files/wp-config.php
index 696b14d..a3f94bc 100644
--- a/image-builder/files/wp-config.php
+++ b/image-builder/files/wp-config.php
@@ -56,4 +56,3 @@ $http_host = $_SERVER['HTTP_HOST'];
 define('WP_HOME',"https://$http_host";);
 define('WP_SITEURL',"https://$http_host";);
 
-remove_filter('template_redirect', 'redirect_canonical');