From 0a5f51d9880afe4a5e2c39f1bee41c22999d6502 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 18 Aug 2020 11:09:13 +0200 Subject: [PATCH] fix merge conflicts resolution errors --- docker-compose.yml | 8 ++++---- docker/handshake/Dockerfile | 2 +- docker/nginx/conf.d/client.conf | 25 ++++--------------------- packages/handshake-api/Dockerfile | 2 +- packages/health-check/Dockerfile | 2 +- packages/webapp/Dockerfile | 2 +- 6 files changed, 12 insertions(+), 29 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7fc0c35d..55c51644 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,14 +27,14 @@ services: expose: - 9980 - sia-upload-legacy: - image: nebulouslabs/sia:dev - container_name: sia-upload-legacy + sia-upload: + image: nebulouslabs/sia:alpine-latest + container_name: sia-upload restart: unless-stopped environment: - SIA_MODULES=gctwr volumes: - - ./docker/data/sia-upload-legacy:/sia-data + - ./docker/data/sia-upload:/sia-data networks: - shared expose: diff --git a/docker/handshake/Dockerfile b/docker/handshake/Dockerfile index 23e504a3..93d57f2a 100644 --- a/docker/handshake/Dockerfile +++ b/docker/handshake/Dockerfile @@ -1,5 +1,5 @@ # we can't use alpine image since it fails on node-gyp -FROM node:14.6.0 +FROM node:14.8.0 WORKDIR /opt/hsd diff --git a/docker/nginx/conf.d/client.conf b/docker/nginx/conf.d/client.conf index b6dfd2cd..e4f85e5b 100644 --- a/docker/nginx/conf.d/client.conf +++ b/docker/nginx/conf.d/client.conf @@ -13,11 +13,6 @@ set_real_ip_from 172.16.0.0/12; set_real_ip_from 192.168.0.0/16; real_ip_header X-Forwarded-For; -# sia-upload is for legacy portals that should keep the upload node alive -upstream siad-upload { - server sia-upload-legacy:9980; -} - upstream siad { server sia:9980; } @@ -97,6 +92,9 @@ server { proxy_pass http://siad/skynet/stats; } + # This endpoint is a backward compatilibilty workaround for reporting stats from legacy + # upload siad node for portals that used double-siad setup. If your portal does not need + # to support additional siad node, you can remove it from this config. location /statsdown { include /etc/nginx/conf.d/include/cors; @@ -104,7 +102,7 @@ server { proxy_cache_valid any 10m; # cache stats for 10 minutes proxy_set_header User-Agent: Sia-Agent; proxy_read_timeout 5m; # extend the read timeout - proxy_pass http://siad-upload/skynet/stats; # serve upload node stats temporarily + proxy_pass http://sia-upload:9980/skynet/stats; # serve upload node stats temporarily } location /health-check { @@ -117,11 +115,6 @@ server { include /etc/nginx/conf.d/include/cors; include /etc/nginx/conf.d/include/proxy-buffer; - # if you are expecting large headers (ie. Skynet-Skyfile-Metadata), tune these values to your needs - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; - proxy_pass http://handshake-api:3100; } @@ -193,11 +186,6 @@ server { proxy_set_header User-Agent: Sia-Agent; # proxy this call to siad /skynet/skylink/ endpoint (make sure the ip is correct) proxy_pass http://siad/skynet/skylink/$skylink$is_args$args; - - # if you are expecting large headers (ie. Skynet-Skyfile-Metadata), tune these values to your needs - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; # cache frequent (> 10) downloads for 24 hours proxy_cache skynet; @@ -224,11 +212,6 @@ server { # proxy this call to siad /skynet/skylink/ endpoint (make sure the ip is correct) # this alias also adds attachment=true url param to force download the file proxy_pass http://siad/skynet/skylink/$skylink?attachment=true&$args; - - # if you are expecting large headers (ie. Skynet-Skyfile-Metadata), tune these values to your needs - proxy_buffer_size 128k; - proxy_buffers 4 256k; - proxy_busy_buffers_size 256k; # cache frequent (> 10) downloads for 24 hours proxy_cache skynet; diff --git a/packages/handshake-api/Dockerfile b/packages/handshake-api/Dockerfile index fa63071f..44fbd068 100644 --- a/packages/handshake-api/Dockerfile +++ b/packages/handshake-api/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.6.0-alpine +FROM node:14.8.0-alpine WORKDIR /usr/app diff --git a/packages/health-check/Dockerfile b/packages/health-check/Dockerfile index 0e23a31f..f83e24d9 100644 --- a/packages/health-check/Dockerfile +++ b/packages/health-check/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.6.0-alpine +FROM node:14.8.0-alpine WORKDIR /usr/app diff --git a/packages/webapp/Dockerfile b/packages/webapp/Dockerfile index 9ebcc41c..d75f8cf4 100644 --- a/packages/webapp/Dockerfile +++ b/packages/webapp/Dockerfile @@ -1,4 +1,4 @@ -FROM node:14.6.0-alpine +FROM node:14.8.0-alpine WORKDIR /usr/app