From 4190225f5a00e9c9eef1dc4491eab419a1acf23f Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 4 Aug 2022 13:49:15 +0200 Subject: [PATCH] feat: share timezeone with host --- tasks/start-oidc-test.yml | 1 + templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 | 1 + templates/cadoles-pod-hydra-passwordless-v1.conf.j2 | 1 + templates/cadoles-pod-hydra-remote-user-v1.conf.j2 | 1 + templates/cadoles-pod-hydra-v1.conf.j2 | 1 + templates/cadoles-pod-shibboleth-sp-v3.conf.j2 | 1 + 6 files changed, 6 insertions(+) diff --git a/tasks/start-oidc-test.yml b/tasks/start-oidc-test.yml index 76ebc3f..9d77f13 100644 --- a/tasks/start-oidc-test.yml +++ b/tasks/start-oidc-test.yml @@ -23,6 +23,7 @@ network: host restart_policy: on-failure recreate: yes + timezone: local env: OIDC_CLIENT_ID: "{{ oidc_test_app_client_id }}" OIDC_CLIENT_SECRET: "{{ oidc_test_app_client_secret }}" diff --git a/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 b/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 index 78a8893..c5002ad 100644 --- a/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 +++ b/templates/cadoles-pod-hydra-dispatcher-v1.conf.j2 @@ -2,6 +2,7 @@ PODMAN_ARGS="\ --name 'cadoles-pod-hydra-dispatcher-v1' \ --replace \ --network=slirp4netns:allow_host_loopback=true \ + --tz=local \ -p 127.0.0.1:3000:80 \ -v /etc/hydra-dispatcher/conf.d:/var/www/config/hydra \ -e APP_ENV=prod \ diff --git a/templates/cadoles-pod-hydra-passwordless-v1.conf.j2 b/templates/cadoles-pod-hydra-passwordless-v1.conf.j2 index e657420..ad25391 100644 --- a/templates/cadoles-pod-hydra-passwordless-v1.conf.j2 +++ b/templates/cadoles-pod-hydra-passwordless-v1.conf.j2 @@ -2,6 +2,7 @@ PODMAN_ARGS="\ -p 127.0.0.1:3001:3000 \ --network=slirp4netns:allow_host_loopback=true \ --replace --name 'cadoles-pod-hydra-passwordless-v1' \ + --tz=local \ -e HTTP_BASE_URL={{ haproxy_public_base_url }}/auth/passwordless \ -e 'SMTP_HOST={{ hydra_passwordless_smtp_host }}' \ -e 'SMTP_PORT={{ hydra_passwordless_smtp_port }}' \ diff --git a/templates/cadoles-pod-hydra-remote-user-v1.conf.j2 b/templates/cadoles-pod-hydra-remote-user-v1.conf.j2 index f21355a..79a91bc 100644 --- a/templates/cadoles-pod-hydra-remote-user-v1.conf.j2 +++ b/templates/cadoles-pod-hydra-remote-user-v1.conf.j2 @@ -2,6 +2,7 @@ PODMAN_ARGS="\ -p 127.0.0.1:3003:80 \ --network=slirp4netns:allow_host_loopback=true \ --replace --name 'cadoles-pod-hydra-remote-user-v1' \ + --tz=local \ -v /etc/hydra-remote-user/conf.d:/var/www/config/remote_user \ -v /etc/hydra-remote-user/apache.conf:/etc/apache2/sites-available/000-default.conf \ -v /etc/hosts:/etc/hosts:ro \ diff --git a/templates/cadoles-pod-hydra-v1.conf.j2 b/templates/cadoles-pod-hydra-v1.conf.j2 index 6c834ff..5b40664 100644 --- a/templates/cadoles-pod-hydra-v1.conf.j2 +++ b/templates/cadoles-pod-hydra-v1.conf.j2 @@ -5,6 +5,7 @@ PODMAN_ARGS="\ -p 127.0.0.1:4444:4444 \ -p 127.0.0.1:4445:4445 \ --tmpfs /tmp \ + --tz=local \ -e 'HYDRA_DSN=mysql://{{ hydra_database_user }}:{{ hydra_database_password }}@tcp({{ hydra_database_host }}:{{ hydra_database_port }})/{{ hydra_database_name }}?parseTime=true' \ -e 'LOG_LEVEL={{ hydra_log_level }}' \ -e 'LOG_LEAK_SENSITIVE_VALUES={{ hydra_log_leak_sensitive_values }}' \ diff --git a/templates/cadoles-pod-shibboleth-sp-v3.conf.j2 b/templates/cadoles-pod-shibboleth-sp-v3.conf.j2 index 8fae66e..c95add7 100644 --- a/templates/cadoles-pod-shibboleth-sp-v3.conf.j2 +++ b/templates/cadoles-pod-shibboleth-sp-v3.conf.j2 @@ -2,6 +2,7 @@ PODMAN_ARGS="\ -p 127.0.0.1:3002:80 \ --network=slirp4netns:allow_host_loopback=true \ --replace --name 'cadoles-pod-shibboleth-sp-v3' \ + --tz=local \ -e 'SP_ENTITY_ID={{ haproxy_public_base_url }}{{ haproxy_hydra_saml_base_path }}' \ -e 'SP_LOG_LEVEL={{ hydra_saml_sp_log_level }}' \ -e 'IDP_ENTITY_ID={{ hydra_saml_idp_entity_id }}' \