fix merge conflicts resolution errors

docker-compose.yml

@@ -27,14 +27,14 @@ services:
     expose:
       - 9980
 
-  sia-upload-legacy:
+  sia-upload:
-    image: nebulouslabs/sia:dev
+    image: nebulouslabs/sia:alpine-latest
-    container_name: sia-upload-legacy
+    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:

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
 

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;
 	}
 
@@ -194,11 +187,6 @@ server {
 		# 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;
 		proxy_cache_key $uri;
@@ -225,11 +213,6 @@ server {
 		# 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;
 		proxy_cache_key $uri;

packages/handshake-api/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.6.0-alpine
+FROM node:14.8.0-alpine
 
 WORKDIR /usr/app
 

packages/health-check/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.6.0-alpine
+FROM node:14.8.0-alpine
 
 WORKDIR /usr/app
 

packages/webapp/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14.6.0-alpine
+FROM node:14.8.0-alpine
 
 WORKDIR /usr/app