branch bow-v2-go updated (cb1ea5b -> 571f757)
This is an automated email from the git hooks/post-receive script. New change to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from cb1ea5b fix healthcheck indentation new dd337a2 ajout de postgres-exporter new 571f757 Merge branch 'bow-v2-go' of gitlab.nuiton.org:chorem/bow into bow-v2-go The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 571f75787e8e4fa6460fb9df2a4ca1e30236f07f Merge: dd337a2 cb1ea5b Author: Benjamin <poussin@codelutin.com> Date: Mon Dec 28 13:06:20 2020 +0100 Merge branch 'bow-v2-go' of gitlab.nuiton.org:chorem/bow into bow-v2-go commit dd337a28b202b0ca0890cf8c7ca47e0803b470d0 Author: Benjamin <poussin@codelutin.com> Date: Mon Dec 28 13:06:00 2020 +0100 ajout de postgres-exporter Summary of changes: docker/docker-compose.yml | 100 +++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit dd337a28b202b0ca0890cf8c7ca47e0803b470d0 Author: Benjamin <poussin@codelutin.com> Date: Mon Dec 28 13:06:00 2020 +0100 ajout de postgres-exporter --- docker/docker-compose.yml | 100 +++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 28 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c949cdd..26d5e96 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -15,6 +15,42 @@ volumes: type: 'high-speed' services: + bow: + image: registry.nuiton.org/chorem/bow:$CI_COMMIT_REF_SLUG + networks: + - traefik-net + - caddy + - default + environment: + DATABASE_URL: 'postgres://dbuser:xxxxxxxx@database:5432/bow' + SECRET_KEY: $BOW_SECRET_KEY + BOW_PUBLIC_URL: https://bookmarks.cl + logging: + driver: 'json-file' + options: + max-file: 5 + max-size: 10m + deploy: + placement: + constraints: + - node.labels.function == saas + resources: + # limits: + # cpus: '0.60' + # memory: 200M + reservations: + cpus: '0.02' + memory: 13M + labels: + - caddy=bookmarks.cl + - caddy.reverse_proxy="{{upstreams 8000}}" + # healthcheck: + # test: bow --healthcheck # À implémenter + # interval: 1m30s + # timeout: 10s + # retries: 3 + # start_period: 3m + database: image: postgres:12.0-alpine environment: @@ -46,16 +82,10 @@ services: retries: 3 start_period: 3m - bow: - image: registry.nuiton.org/chorem/bow:$CI_COMMIT_REF_SLUG - networks: - - traefik-net - - caddy - - default + postgres-exporter: + image: wrouesnel/postgres_exporter environment: - DATABASE_URL: 'postgres://dbuser:xxxxxxxx@database:5432/bow' - SECRET_KEY: $BOW_SECRET_KEY - BOW_PUBLIC_URL: https://bookmarks.cl + DATA_SOURCE_NAME: "postgres://dbuser:xxxxxxxx@database:5432/bow?sslmode=disable" logging: driver: 'json-file' options: @@ -64,26 +94,40 @@ services: deploy: placement: constraints: - - node.labels.function == saas + - node.labels.function==saas resources: - # limits: - # cpus: '0.60' - # memory: 200M + # limits: + # cpus: '0.60' + # memory: 200M reservations: - cpus: '0.02' - memory: 13M + cpus: '0.01' + memory: 10M labels: - - traefik.enable=true - - traefik.http.routers.bow.rule=Host(`bookmarks.cl`) - - traefik.http.services.bow.loadbalancer.server.port=8000 - - traefik.http.routers.bow.entrypoints=https - - traefik.http.routers.bow.tls=true - - traefik.http.routers.bow.tls.certresolver=codelutin - - caddy=bookmarks.cl + - prometheus=true + - caddy=postgres-exporter.admin.bookmarks.cl - caddy.reverse_proxy="{{upstreams 8000}}" - # healthcheck: - # test: bow --healthcheck # À implémenter - # interval: 1m30s - # timeout: 10s - # retries: 3 - # start_period: 3m + +# pgadmin: +# image: registry.nuiton.org/codelutin/admsys/swarm-stack/pgadmin:latest +# networks: +# - caddy +# - default +# env_file: +# - db.env +# logging: +# driver: "json-file" +# options: +# max-file: 5 +# max-size: 10m +# deploy: +# placement: +# constraints: +# - node.labels.function==infracl +# labels: +# caddy: db.admin.bookmarks.cl +# caddy.import: prod_config +# caddy.reverse_proxy: "@cl_ip {{upstreams 80}}" +# resources: +# reservations: +# cpus: "0.01" +# memory: 115M -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch bow-v2-go in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 571f75787e8e4fa6460fb9df2a4ca1e30236f07f Merge: dd337a2 cb1ea5b Author: Benjamin <poussin@codelutin.com> Date: Mon Dec 28 13:06:20 2020 +0100 Merge branch 'bow-v2-go' of gitlab.nuiton.org:chorem/bow into bow-v2-go docker/docker-compose.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --cc docker/docker-compose.yml index 26d5e96,1afe0d5..fd661e8 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@@ -75,17 -39,23 +75,17 @@@ services reservations: cpus: '0.02' memory: 50M - healthcheck: - test: pg_isready -q -d ${POSTGRES_DB} -U ${POSTGRES_USER} || exit 1 - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 3m + healthcheck: + test: pg_isready -q || exit 1 + interval: 1m30s + timeout: 10s + retries: 3 + start_period: 3m - bow: - image: registry.nuiton.org/chorem/bow:$CI_COMMIT_REF_SLUG - networks: - - traefik-net - - caddy - - default + postgres-exporter: + image: wrouesnel/postgres_exporter environment: - DATABASE_URL: 'postgres://dbuser:xxxxxxxx@database:5432/bow' - SECRET_KEY: $BOW_SECRET_KEY - BOW_PUBLIC_URL: https://bookmarks.cl + DATA_SOURCE_NAME: "postgres://dbuser:xxxxxxxx@database:5432/bow?sslmode=disable" logging: driver: 'json-file' options: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm