From e45c03af654bbd60a9ea8222f33dd7bcc4648482 Mon Sep 17 00:00:00 2001 From: Anas-hameed Date: Thu, 26 Jun 2025 14:22:17 +0500 Subject: [PATCH 1/3] Fix: make job consistent with wordpress environment Add environment variable for db connection during init task make volume path consistent with wordpress container --- tutorwordpress/patches/local-docker-compose-jobs-services | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tutorwordpress/patches/local-docker-compose-jobs-services b/tutorwordpress/patches/local-docker-compose-jobs-services index 03d85b3..2b824da 100644 --- a/tutorwordpress/patches/local-docker-compose-jobs-services +++ b/tutorwordpress/patches/local-docker-compose-jobs-services @@ -1,7 +1,13 @@ wordpress-job: image: {{ WORDPRESS_DOCKER_IMAGE }} + environment: + WORDPRESS_DB_HOST: {{ WORDPRESS_MYSQL_HOST }} + WORDPRESS_DB_USER: {{ WORDPRESS_MYSQL_USERNAME }} + WORDPRESS_DB_PASSWORD: {{ WORDPRESS_MYSQL_PASSWORD }} + WORDPRESS_DB_NAME: {{ WORDPRESS_MYSQL_DATABASE }} + WORDPRESS_TABLE_PREFIX: {{ WORDPRESS_TABLE_PREFIX }} volumes: - - ../../data/wordpress:/var/www/html/wp-content + - ../../data/wordpress/wp-content:/var/www/html/wp-content depends_on: - lms {% if RUN_MYSQL %}- mysql{% endif %} From 8f22970764a14eb3239c800d2062c01b722eda7c Mon Sep 17 00:00:00 2001 From: Anas-hameed Date: Fri, 27 Jun 2025 18:52:26 +0500 Subject: [PATCH 2/3] fix: use the default wordpress directory as the mount path We do this as wordpress would copy everything from the /usr/src/wordpress to /var/www/html on startup when it would not find a valid wordpress installation in that directory. This is also helpful when we need to install plugins during the initialization tasks as we more than often need to keep a persistent wp-config.php file. --- tutorwordpress/patches/local-docker-compose-jobs-services | 3 ++- tutorwordpress/patches/local-docker-compose-services | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tutorwordpress/patches/local-docker-compose-jobs-services b/tutorwordpress/patches/local-docker-compose-jobs-services index 2b824da..0a5cd10 100644 --- a/tutorwordpress/patches/local-docker-compose-jobs-services +++ b/tutorwordpress/patches/local-docker-compose-jobs-services @@ -7,7 +7,8 @@ wordpress-job: WORDPRESS_DB_NAME: {{ WORDPRESS_MYSQL_DATABASE }} WORDPRESS_TABLE_PREFIX: {{ WORDPRESS_TABLE_PREFIX }} volumes: - - ../../data/wordpress/wp-content:/var/www/html/wp-content + - ../../data/wordpress:/var/www/html + depends_on: - lms {% if RUN_MYSQL %}- mysql{% endif %} diff --git a/tutorwordpress/patches/local-docker-compose-services b/tutorwordpress/patches/local-docker-compose-services index 63309d6..b7d6f3b 100644 --- a/tutorwordpress/patches/local-docker-compose-services +++ b/tutorwordpress/patches/local-docker-compose-services @@ -8,7 +8,7 @@ wordpress: WORDPRESS_DB_NAME: {{ WORDPRESS_MYSQL_DATABASE }} WORDPRESS_TABLE_PREFIX: {{ WORDPRESS_TABLE_PREFIX }} volumes: - - ../../data/wordpress/wp-content:/var/www/html/wp-content + - ../../data/wordpress:/var/www/html {%- if RUN_MYSQL %} depends_on: - mysql From 44adbb29e0ebf28b1ac30682c5aff45829d17033 Mon Sep 17 00:00:00 2001 From: Anas-hameed Date: Mon, 7 Jul 2025 19:15:51 +0500 Subject: [PATCH 3/3] fix: update the mount path and volume for kubernetes deployment --- tutorwordpress/patches/k8s-deployments | 6 +++--- tutorwordpress/patches/k8s-jobs | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tutorwordpress/patches/k8s-deployments b/tutorwordpress/patches/k8s-deployments index ead8451..3d84fae 100644 --- a/tutorwordpress/patches/k8s-deployments +++ b/tutorwordpress/patches/k8s-deployments @@ -17,10 +17,10 @@ spec: initContainers: - name: init-wordpress image: {{ WORDPRESS_DOCKER_IMAGE }} - command: ['sh', '-c', 'chown -R www-data:www-data /var/www/html/wp-content'] + command: ['sh', '-c', 'chown -R www-data:www-data /var/www/html'] volumeMounts: - name: wordpress-data - mountPath: /var/www/html/wp-content + mountPath: /var/www/html securityContext: runAsUser: 0 containers: @@ -41,7 +41,7 @@ spec: value: {{ WORDPRESS_TABLE_PREFIX }} volumeMounts: - name: wordpress-data - mountPath: /var/www/html/wp-content + mountPath: /var/www/html securityContext: runAsUser: 33 runAsGroup: 33 diff --git a/tutorwordpress/patches/k8s-jobs b/tutorwordpress/patches/k8s-jobs index baad901..c1412e3 100644 --- a/tutorwordpress/patches/k8s-jobs +++ b/tutorwordpress/patches/k8s-jobs @@ -12,9 +12,20 @@ spec: containers: - name: wordpress image: {{ WORDPRESS_DOCKER_IMAGE }} + env: + - name: WORDPRESS_DB_HOST + value: {{ WORDPRESS_MYSQL_HOST }} + - name: WORDPRESS_DB_USER + value: {{ WORDPRESS_MYSQL_USERNAME }} + - name: WORDPRESS_DB_PASSWORD + value: {{ WORDPRESS_MYSQL_PASSWORD }} + - name: WORDPRESS_DB_NAME + value: {{ WORDPRESS_MYSQL_DATABASE }} + - name: WORDPRESS_TABLE_PREFIX + value: {{ WORDPRESS_TABLE_PREFIX }} volumeMounts: - name: wordpress-data - mountPath: /var/www/html/wp-content + mountPath: /var/www/html volumes: - name: wordpress-data persistentVolumeClaim: