From f788634d6bf81643810b4f0c8c33dcbd8e850907 Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 9 Aug 2023 11:56:16 +0200 Subject: [PATCH] Use configmaps and secrets --- src/main/resources/taiga/docker-compose.yml | 24 ++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/main/resources/taiga/docker-compose.yml b/src/main/resources/taiga/docker-compose.yml index db4cd50..828e129 100644 --- a/src/main/resources/taiga/docker-compose.yml +++ b/src/main/resources/taiga/docker-compose.yml @@ -28,6 +28,11 @@ spec: - name: taiga-media mountPath: /taiga-back/media readOnly: false + envFrom: + - configMapRef: + name: taiga-back-configmap + - secretRef: + name: taiga-back-secret env: - name: POSTGRES_USER # ToDo: does taiga need a specific postgres version? valueFrom: # ToDo: which env vars are needed by taiga-back and taiga-async @@ -61,6 +66,11 @@ spec: - name: taiga-media mountPath: /taiga-back/media readOnly: false + envFrom: + - configMapRef: + name: taiga-back-configmap + - secretRef: + name: taiga-back-secret env: # ToDo: Does every container need access to all env vars? - name: POSTGRES_USER # ToDo: does taiga need a specific postgres version? valueFrom: # ToDo: which env vars are needed by taiga-back and taiga-async @@ -94,7 +104,12 @@ spec: - name: taiga-media mountPath: /taiga-back/media readOnly: false - env: + envFrom: + - configMapRef: + name: taiga-back-configmap + - secretRef: + name: taiga-back-secret + env: - name: POSTGRES_USER valueFrom: secretKeyRef: @@ -123,13 +138,12 @@ spec: - name: taiga-async-rabbitmq-data mountPath: /var/lib/rabbitmq readOnly: false + envFrom: + - secretRef: + name: taiga-rabbitmq-secret env: - name: RABBITMQ_ERLANG_COOKIE value: ERLANG_COOKIE_VALUE - - name: RABBITMQ_DEFAULT_USER - value: RABBITMQ_USER - - name: RABBITMQ_DEFAULT_PASS - value: RABBITMQ_PASS - name: RABBITMQ_DEFAULT_VHOST value: RABBITMQ_VHOST - name: taiga-front