mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-11-05 12:57:52 +00:00
Get rid of mysql/auth.env
For simplification, we move the environment variables away from the auth.env file.
This commit is contained in:
parent
0711dd462b
commit
ae2faea668
@ -1 +0,0 @@
|
||||
MYSQL_ROOT_PASSWORD={{ MYSQL_ROOT_PASSWORD }}
|
@ -320,10 +320,7 @@ spec:
|
||||
args: ["mysqld", "--character-set-server=utf8", "--collation-server=utf8_general_ci"]
|
||||
env:
|
||||
- name: MYSQL_ROOT_PASSWORD
|
||||
valueFrom:
|
||||
configMapKeyRef:
|
||||
name: mysql-config
|
||||
key: MYSQL_ROOT_PASSWORD
|
||||
value: "{{ MYSQL_ROOT_PASSWORD }}"
|
||||
ports:
|
||||
- containerPort: 3306
|
||||
volumeMounts:
|
||||
|
@ -35,8 +35,6 @@ configMapGenerator:
|
||||
- name: nginx-config
|
||||
files:{% for file in "apps/nginx"|walk_templates %}
|
||||
- {{ file }}{% endfor %}
|
||||
- name: mysql-config
|
||||
env: apps/mysql/auth.env
|
||||
{{ patch("kustomization-configmapgenerator") }}
|
||||
|
||||
{{ patch("kustomization") }}
|
@ -26,7 +26,8 @@ services:
|
||||
restart: unless-stopped
|
||||
volumes:
|
||||
- ../../data/mysql:/var/lib/mysql
|
||||
env_file: ../apps/mysql/auth.env
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: "{{ MYSQL_ROOT_PASSWORD }}"
|
||||
{% endif %}
|
||||
|
||||
{% if ACTIVATE_ELASTICSEARCH %}
|
||||
|
Loading…
Reference in New Issue
Block a user