From e45458569d4420564128c497d77845688ca464d6 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 29 Mar 2022 14:36:55 +0000
Subject: [PATCH] Resolve "/wp-admin redirects to :8080"
---
CHANGELOG.md | 12 ++++++++++++
Chart.yaml | 2 +-
values.yaml | 4 ++--
wp-docker/Dockerfile | 12 +++++++++---
wp-docker/install-php-extensions.sh | 2 +-
5 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25fdb1c..d8bdd2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [0.6.15] - 2022-03-29
+
+- Fix wrong redirect to port 8080
+
+## [0.6.3-0.6.14] - 2022-02-27 to 2022-03-28
+
+- Update Helm release Redis to v16.7.0
+- Update Helm release mariadb to v10.4.4
+- And updates to those Helm Releases to intermediate versions
+- Allow uploading SVG files
+- Do not install classic editor plugin by default
+
## [0.6.2] - 2022-02-25
- Set correct tags for Wordpress containers
diff --git a/Chart.yaml b/Chart.yaml
index 50d4bf3..2610c7d 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -5,7 +5,7 @@ description: WordPress with a replicated MariaDB backend
name: wordpress
# Please only change the chart version as part of the release procedure: see
# RELEASING.md
-version: 0.6.14
+version: 0.6.15
icon: https://make.wordpress.org/design/files/2016/09/WordPress-logotype-wmark.png
dependencies:
- name: mariadb
diff --git a/values.yaml b/values.yaml
index be4436e..b6d15b1 100644
--- a/values.yaml
+++ b/values.yaml
@@ -237,13 +237,13 @@ ansibleVars:
image:
repository: open.greenhost.net:4567/stackspin/wordpress-helm/wordpress
- tag: 0.6.2
+ tag: 0.6.15
pullPolicy: Always
pullSecrets: []
initImage:
repository: open.greenhost.net:4567/stackspin/wordpress-helm/wordpress-cli-ansible
- tag: 0.6.2
+ tag: 0.6.15
pullPolicy: Always
ingress:
diff --git a/wp-docker/Dockerfile b/wp-docker/Dockerfile
index 7826957..b714044 100644
--- a/wp-docker/Dockerfile
+++ b/wp-docker/Dockerfile
@@ -23,10 +23,16 @@ ENV PORT 8080
ENV TLS_PORT 8443
ENV TRUSTED_PROXY_IP 10.0.0.0/8
-RUN sed -i "s/\<80\>/$PORT/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
-RUN sed -i "s/\<443\>/$TLS_PORT/g" /etc/apache2/sites-available/default-ssl.conf /etc/apache2/ports.conf
-RUN sed "s/\tCustomLog \${APACHE_LOG_DIR}\/access.log combined/\tCustomLog \${APACHE_LOG_DIR}\/access.log remoteip/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
+# Remove port numbers from VirtualHosts
+RUN sed -i "s/:80//g" /etc/apache2/sites-available/000-default.conf
+RUN sed -i "s/:443//g" /etc/apache2/sites-available/default-ssl.conf
+
+# Set correct port in ports.conf
+RUN sed -i "s/\<80\>/$PORT/g" /etc/apache2/ports.conf
+RUN sed -i "s/\<443\>/$TLS_PORT/g" /etc/apache2/ports.conf
+# Log remote IP addresses instead of the LoadBalancer IP
+RUN sed "s/\tCustomLog \${APACHE_LOG_DIR}\/access.log combined/\tCustomLog \${APACHE_LOG_DIR}\/access.log remoteip/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
RUN echo "RemoteIPTrustedProxy $TRUSTED_PROXY_IP" >> /etc/apache2/apache2.conf
RUN echo "RemoteIPHeader X-Forwarded-For" >> /etc/apache2/apache2.conf
# Add custom log format called "remoteip" that uses remoteip module
diff --git a/wp-docker/install-php-extensions.sh b/wp-docker/install-php-extensions.sh
index 8b71dc0..82f7384 100644
--- a/wp-docker/install-php-extensions.sh
+++ b/wp-docker/install-php-extensions.sh
@@ -26,7 +26,7 @@ docker-php-ext-install -j "$(nproc)" \
zip \
;
# https://pecl.php.net/package/imagick
-pecl install imagick-3.5.0;
+pecl install imagick-3.7.0;
docker-php-ext-enable imagick;
rm -r /tmp/pear;
--
GitLab