Skip to content

Commit

Permalink
chore: up
Browse files Browse the repository at this point in the history
  • Loading branch information
antoinebigard committed Dec 20, 2024
1 parent b5acfac commit a462c4c
Show file tree
Hide file tree
Showing 7 changed files with 219 additions and 223 deletions.
10 changes: 5 additions & 5 deletions .infra/ansible/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@
chdir: /opt/app
cmd: "sudo /opt/app/tools/ssl/renew-certificate.sh {{dns_name}}"

- name: "Setup de la Metabase"
shell:
chdir: /opt/app
cmd: "sudo bash /opt/app/configs/metabase/setup-metabase.sh"
timeout: 86400 # 1 day
# - name: "Setup de la Metabase"
# shell:
# chdir: /opt/app
# cmd: "sudo bash /opt/app/configs/metabase/setup-metabase.sh"
# timeout: 86400 # 1 day

- name: "Prune Docker"
shell:
Expand Down
2 changes: 0 additions & 2 deletions .infra/docker-compose.preview-system.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

x-default: &default
deploy:
resources:
Expand Down
2 changes: 0 additions & 2 deletions .infra/docker-compose.preview.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

x-deploy-default: &deploy-default
resources:
limits:
Expand Down
74 changes: 36 additions & 38 deletions .infra/docker-compose.production.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

# The following variables define reusable configurations for deployment, providing consistent and predefined
# behaviors for updating, rolling back, and restarting services.

Expand Down Expand Up @@ -87,39 +85,39 @@ services:
tag: docker.txt.{{product_name}}.{{env_type}}.ui
fluentd-async: "true"

metabase:
<<: *default
image: metabase/metabase:v0.46.6.4
deploy:
<<: *deploy-default
resources:
limits:
memory: 2g
environment:
JAVA_TIMEZONE: Europe/Paris
MB_SITE_LOCALE: fr
MB_SITE_URL: "{{dns_name}}/metabase"
MB_DB_TYPE: postgres
MB_DB_CONNECTION_URI: "{{vault[env_type].METABASE_DB_URI}}"
MB_ENCRYPTION_SECRET_KEY: "{{vault[env_type].METABASE_ENCRYPTION_SECRET_KEY}}"
MB_EMAIL_FROM_ADDRESS: "{{vault.METABASE_EMAIL_FROM_ADDRESS}}"
MB_EMAIL_FROM_NAME: "{{vault.METABASE_EMAIL_FROM_NAME}}"
MB_PASSWORD_COMPLEXITY: strong
MB_START_OF_WEEK: monday
MB_EMAIL_SMTP_HOST: "{{vault[env_type].SMTP_HOST}}"
MB_EMAIL_SMTP_PORT: "{{vault[env_type].SMTP_PORT}}"
MB_EMAIL_SMTP_USERNAME: "{{vault[env_type].SMTP_AUTH_USER}}"
MB_EMAIL_SMTP_PASSWORD: "{{vault[env_type].SMTP_AUTH_PASS}}"
MB_EMAIL_SMTP_SECURITY: tls
healthcheck:
test: curl --fail -I http://localhost:3000/api/health || exit 1
interval: 15s
timeout: 5s
retries: 5
start_period: 6m
logging:
driver: "fluentd"
options:
fluentd-address: localhost:24224
tag: docker.json.{{product_name}}.{{env_type}}.metabase
fluentd-async: "true"
# metabase:
# <<: *default
# image: metabase/metabase:v0.46.6.4
# deploy:
# <<: *deploy-default
# resources:
# limits:
# memory: 2g
# environment:
# JAVA_TIMEZONE: Europe/Paris
# MB_SITE_LOCALE: fr
# MB_SITE_URL: "{{dns_name}}/metabase"
# MB_DB_TYPE: postgres
# MB_DB_CONNECTION_URI: "{{vault[env_type].METABASE_DB_URI}}"
# MB_ENCRYPTION_SECRET_KEY: "{{vault[env_type].METABASE_ENCRYPTION_SECRET_KEY}}"
# MB_EMAIL_FROM_ADDRESS: "{{vault.METABASE_EMAIL_FROM_ADDRESS}}"
# MB_EMAIL_FROM_NAME: "{{vault.METABASE_EMAIL_FROM_NAME}}"
# MB_PASSWORD_COMPLEXITY: strong
# MB_START_OF_WEEK: monday
# MB_EMAIL_SMTP_HOST: "{{vault[env_type].SMTP_HOST}}"
# MB_EMAIL_SMTP_PORT: "{{vault[env_type].SMTP_PORT}}"
# MB_EMAIL_SMTP_USERNAME: "{{vault[env_type].SMTP_AUTH_USER}}"
# MB_EMAIL_SMTP_PASSWORD: "{{vault[env_type].SMTP_AUTH_PASS}}"
# MB_EMAIL_SMTP_SECURITY: tls
# healthcheck:
# test: curl --fail -I http://localhost:3000/api/health || exit 1
# interval: 15s
# timeout: 5s
# retries: 5
# start_period: 6m
# logging:
# driver: "fluentd"
# options:
# fluentd-address: localhost:24224
# tag: docker.json.{{product_name}}.{{env_type}}.metabase
# fluentd-async: "true"
2 changes: 0 additions & 2 deletions .infra/docker-compose.recette.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

services:
smtp:
image: axllent/mailpit:latest
Expand Down
Loading

0 comments on commit a462c4c

Please sign in to comment.