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: diff --git a/tutorwordpress/patches/local-docker-compose-jobs-services b/tutorwordpress/patches/local-docker-compose-jobs-services index 03d85b3..0a5cd10 100644 --- a/tutorwordpress/patches/local-docker-compose-jobs-services +++ b/tutorwordpress/patches/local-docker-compose-jobs-services @@ -1,7 +1,14 @@ 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:/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