branch bow-v2-go updated (53030b0 -> 17b56b2)
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 53030b0 correction du docker-compose new 17b56b2 correction variable url back The 1 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 17b56b2c9335c8e5760a80030a6952874c5c7ff0 Author: Benjamin <poussin@codelutin.com> Date: Mon May 11 21:23:54 2020 +0200 correction variable url back Summary of changes: docker/docker-compose.yml | 36 ++++++++++++++++++------------------ web/.env | 2 +- web/.env.development | 2 +- 3 files changed, 20 insertions(+), 20 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 17b56b2c9335c8e5760a80030a6952874c5c7ff0 Author: Benjamin <poussin@codelutin.com> Date: Mon May 11 21:23:54 2020 +0200 correction variable url back --- docker/docker-compose.yml | 36 ++++++++++++++++++------------------ web/.env | 2 +- web/.env.development | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index af1910c..2f5b12e 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: '3.7' networks: traefik-net: @@ -10,7 +10,7 @@ volumes: driver: cinder driver_opts: size: 1 - type: "high-speed" + type: 'high-speed' services: database: @@ -22,44 +22,44 @@ services: volumes: - 'postgresql_data:/var/lib/postgresql/data:rw' logging: - driver: "json-file" - options: - max-file: 5 - max-size: 10m + driver: 'json-file' + options: + max-file: 5 + max-size: 10m deploy: placement: constraints: - node.labels.function==saas resources: -# limits: -# cpus: '0.60' -# memory: 200M + # limits: + # cpus: '0.60' + # memory: 200M reservations: cpus: '0.02' memory: 50M bow: - image: registry.nuiton.org/codelutin/chorem/bow:$CI_COMMIT_REF_SLUG + image: registry.nuiton.org/chorem/bow:$CI_COMMIT_REF_SLUG networks: - traefik-net - default environment: - DATABASE_URL: "postgres://dbuser:xxxxxxxx@database:5432/bow" + 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 + driver: 'json-file' + options: + max-file: 5 + max-size: 10m deploy: placement: - constraints: + constraints: - node.labels.function == saas resources: # limits: - # cpus: '0.60' - # memory: 200M + # cpus: '0.60' + # memory: 200M reservations: cpus: '0.02' memory: 60M diff --git a/web/.env b/web/.env index dd9aeb0..0eb4931 100644 --- a/web/.env +++ b/web/.env @@ -1 +1 @@ -BACKEND_URL=/ \ No newline at end of file +VUE_APP_BACKEND_URL=/ \ No newline at end of file diff --git a/web/.env.development b/web/.env.development index aa23f30..7a8fd24 100644 --- a/web/.env.development +++ b/web/.env.development @@ -1 +1 @@ -BACKEND_URL=http://localhost:8000/ \ No newline at end of file +VUE_APP_BACKEND_URL=http://localhost:8000/ \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm