Skip to content

Fix: make job consistent with wordpress environment #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tutorwordpress/patches/k8s-deployments
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
13 changes: 12 additions & 1 deletion tutorwordpress/patches/k8s-jobs
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 8 additions & 1 deletion tutorwordpress/patches/local-docker-compose-jobs-services
Original file line number Diff line number Diff line change
@@ -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 %}
2 changes: 1 addition & 1 deletion tutorwordpress/patches/local-docker-compose-services
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down