From 0ec7cdaa960d68b8e6211f60f67f5d9b8cf6439a Mon Sep 17 00:00:00 2001 From: Roman Malyshev Date: Fri, 18 Sep 2020 17:32:23 +0300 Subject: [PATCH 1/7] replace web-client version --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 664334f..b6e3c9f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -114,9 +114,9 @@ services: entrypoint: "" command: /opt/config/apply.sh web_client: - image: tokend/web-client:1.12.0 + image: tokend/web-client:1.13.0-rc.0 restart: unless-stopped - volumes: + volumes: - ./configs/client.js:/usr/share/nginx/html/static/env.js ports: - 8060:80 From e6acb367280bbdb7b1077f6e1ac6bd755d1ffba4 Mon Sep 17 00:00:00 2001 From: Roman Malyshev Date: Fri, 11 Dec 2020 18:30:14 +0200 Subject: [PATCH 2/7] Add new headers --- configs/nginx.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/nginx.conf b/configs/nginx.conf index e755620..d892041 100644 --- a/configs/nginx.conf +++ b/configs/nginx.conf @@ -24,7 +24,7 @@ http { if ($request_method = 'OPTIONS') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Max-Age' 1728000 always; add_header 'Content-Type' 'text/plain; charset=utf-8' always; @@ -35,7 +35,7 @@ http { if ($request_method = 'DELETE') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -43,7 +43,7 @@ http { if ($request_method = 'POST') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -51,7 +51,7 @@ http { if ($request_method = 'GET') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -59,7 +59,7 @@ http { if ($request_method = 'PATCH') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -67,7 +67,7 @@ http { if ($request_method = 'PUT') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } From 231981261877dce191d7968604a025169b8a36e1 Mon Sep 17 00:00:00 2001 From: Yaroslav Panasenko Date: Fri, 29 Jan 2021 18:00:03 +0200 Subject: [PATCH 3/7] Updated core and horizon versions --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b6e3c9f..df8a594 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,7 +53,7 @@ services: - --appendonly - "yes" core: - image: tokend/core:3.6.5 + image: tokend/core:3.7.0-x.8 depends_on: - traefik restart: unless-stopped @@ -70,7 +70,7 @@ services: labels: - "autoheal=true" horizon: - image: tokend/horizon:3.9.1 + image: tokend/horizon:3.10.0-x.7 depends_on: - core restart: unless-stopped From 3aebaa30efa70e24196b5c0bb17ec7f319739611 Mon Sep 17 00:00:00 2001 From: Roman Malyshev Date: Tue, 9 Feb 2021 16:40:23 +0200 Subject: [PATCH 4/7] Fix nginx headers account-id --- configs/nginx.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configs/nginx.conf b/configs/nginx.conf index d892041..5cdd2ef 100644 --- a/configs/nginx.conf +++ b/configs/nginx.conf @@ -24,7 +24,7 @@ http { if ($request_method = 'OPTIONS') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,Account-Id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Max-Age' 1728000 always; add_header 'Content-Type' 'text/plain; charset=utf-8' always; @@ -35,7 +35,7 @@ http { if ($request_method = 'DELETE') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,Account-Id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -43,7 +43,7 @@ http { if ($request_method = 'POST') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,Account-Id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -51,7 +51,7 @@ http { if ($request_method = 'GET') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,Account-Id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -59,7 +59,7 @@ http { if ($request_method = 'PATCH') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,Account-Id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } @@ -67,7 +67,7 @@ http { if ($request_method = 'PUT') { add_header 'Access-Control-Allow-Origin' '$http_origin' always; add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, PATCH, OPTIONS, DELETE' always; - add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,account_id' always; + add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Signature,Account-Id' always; add_header 'Access-Control-Allow-Credentials' true always; add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always; } From 66f13425a56de5ec41bb74fefc51c626617e41f3 Mon Sep 17 00:00:00 2001 From: Roman Malyshev Date: Tue, 9 Feb 2021 19:26:52 +0200 Subject: [PATCH 5/7] Update version web-client, admin-panel --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index df8a594..57dc45e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -114,14 +114,14 @@ services: entrypoint: "" command: /opt/config/apply.sh web_client: - image: tokend/web-client:1.13.0-rc.0 + image: tokend/web-client:1.13.0-rc.1 restart: unless-stopped volumes: - ./configs/client.js:/usr/share/nginx/html/static/env.js ports: - 8060:80 admin_client: - image: tokend/admin-client:1.13.0 + image: tokend/admin-client:1.14.0-rc.0 restart: unless-stopped volumes: - ./configs/client.js:/usr/share/nginx/html/static/env.js From 50024dda7008bc1804f77f181f56da5c117dbb80 Mon Sep 17 00:00:00 2001 From: Skriabin Date: Tue, 25 May 2021 16:24:10 +0300 Subject: [PATCH 6/7] Update core and horizon versions --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 55447a9..dd8af5c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,7 +53,7 @@ services: - --appendonly - "yes" core: - image: tokend/core:3.7.0-x.10 + image: tokend/core:3.7.0-x.11 depends_on: - traefik restart: unless-stopped @@ -70,7 +70,7 @@ services: labels: - "autoheal=true" horizon: - image: tokend/horizon:3.10.0-x.10 + image: tokend/horizon:3.10.0-x.11 depends_on: - core restart: unless-stopped From 41a2a802c5a6f441666c0efd24595176ad268c75 Mon Sep 17 00:00:00 2001 From: Artem Skriabin <33949551+artemskriabin@users.noreply.github.com> Date: Tue, 1 Jun 2021 13:16:47 +0300 Subject: [PATCH 7/7] Update docker-compose.yml --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index dd8af5c..435878e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,7 +53,7 @@ services: - --appendonly - "yes" core: - image: tokend/core:3.7.0-x.11 + image: tokend/core:3.7.0 depends_on: - traefik restart: unless-stopped @@ -70,7 +70,7 @@ services: labels: - "autoheal=true" horizon: - image: tokend/horizon:3.10.0-x.11 + image: tokend/horizon:3.10.0 depends_on: - core restart: unless-stopped @@ -83,7 +83,7 @@ services: - ./configs/horizon.yaml:/config.yaml - horizon-data:/data api: - image: tokend/identity:4.7.0-rc.1 + image: tokend/identity:4.7.0 restart: unless-stopped depends_on: - horizon @@ -285,7 +285,7 @@ services: entrypoint: "erc20-deposit-svc" command: ["run", "funnel"] erc20-withdraw: - image: tokend/erc20-withdraw-svc:1.0.9-x.0 + image: tokend/erc20-withdraw-svc:1.0.9 restart: unless-stopped depends_on: - horizon