Merge remote-tracking branch 'origin/master' into dashboard-v2-stripe-test

2022-05-04 16:49:24 +02:00 · 2022-05-04 16:49:24 +02:00 · 75724705cd
parent a71de44276 5b09aa78b9
commit 75724705cd
48 changed files with 2307 additions and 3357 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -3,48 +3,48 @@ updates:
  - package-ecosystem: npm
    directory: "/packages/dashboard"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: npm
    directory: "/packages/dnslink-api"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: npm
    directory: "/packages/handshake-api"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: npm
    directory: "/packages/health-check"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: npm
    directory: "/packages/website"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: docker
    directory: "/docker/nginx"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: docker
    directory: "/docker/sia"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: docker
    directory: "/packages/dashboard"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: docker
    directory: "/packages/dnslink-api"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: docker
    directory: "/packages/handshake-api"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: docker
    directory: "/packages/health-check"
    schedule:
-      interval: weekly
+      interval: monthly
  - package-ecosystem: docker
    directory: "/packages/website"
    schedule:
-      interval: weekly
+      interval: monthly
--- a/.github/workflows/lint-dockerfiles.yml
+++ b/.github/workflows/lint-dockerfiles.yml
@ -14,6 +14,7 @@ jobs:
      matrix:
        dockerfile:
          - docker/nginx/Dockerfile
+          - docker/nginx/testing/Dockerfile
          - docker/sia/Dockerfile
          - packages/dashboard/Dockerfile
          - packages/dashboard-v2/Dockerfile
--- a/.github/workflows/nginx-lua-unit-tests.yml
+++ b/.github/workflows/nginx-lua-unit-tests.yml
@ -7,7 +7,11 @@ on:
  push:
    branches:
      - master
+    paths:
+      - docker/nginx/libs/**
  pull_request:
+    paths:
+      - docker/nginx/libs/**

 jobs:
  test:
--- a/README.md
+++ b/README.md
@ -3,7 +3,7 @@
 ## Latest Setup Documentation

 Latest Skynet Webportal setup documentation and the setup process Skynet Labs
-supports is located at https://docs.siasky.net/webportal-management/overview.
+supports is located at https://portal-docs.skynetlabs.com/.

 Some scripts and setup documentation contained in this repository
 (`skynet-webportal`) may be outdated and generally should not be used.
--- a/changelog/items/bugs-fixed/fix-context.md
+++ b/changelog/items/bugs-fixed/fix-context.md
@ -0,0 +1,2 @@
+- Fix `dashboard-v2` Dockerfile context in `docker-compose.accounts.yml` to
+  avoid Ansible deploy (docker compose build) `permission denied` issues.
--- a/docker-compose.abuse-scanner.yml
+++ b/docker-compose.abuse-scanner.yml
@ -10,7 +10,7 @@ services:
  abuse-scanner:
    # uncomment "build" and comment out "image" to build from sources
    # build: https://github.com/SkynetLabs/abuse-scanner.git#main
-    image: skynetlabs/abuse-scanner
+    image: skynetlabs/abuse-scanner:0.1.1
    container_name: abuse-scanner
    restart: unless-stopped
    logging: *default-logging
--- a/docker-compose.accounts.yml
+++ b/docker-compose.accounts.yml
@ -55,9 +55,11 @@ services:
      - mongo

  dashboard:
-    build:
-      context: ./packages/dashboard
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/dashboard/Dockerfile
+    image: skynetlabs/dashboard
    container_name: dashboard
    restart: unless-stopped
    logging: *default-logging
--- a/docker-compose.blocker.yml
+++ b/docker-compose.blocker.yml
@ -15,7 +15,7 @@ services:
  blocker:
    # uncomment "build" and comment out "image" to build from sources
    # build: https://github.com/SkynetLabs/blocker.git#main
-    image: skynetlabs/blocker
+    image: skynetlabs/blocker:0.1.1
    container_name: blocker
    restart: unless-stopped
    logging: *default-logging
--- a/docker-compose.malware-scanner.yml
+++ b/docker-compose.malware-scanner.yml
@ -28,7 +28,7 @@ services:
  malware-scanner:
    # uncomment "build" and comment out "image" to build from sources
    # build: https://github.com/SkynetLabs/malware-scanner.git#main
-    image: skynetlabs/malware-scanner
+    image: skynetlabs/malware-scanner:0.1.0
    container_name: malware-scanner
    restart: unless-stopped
    logging: *default-logging
--- a/docker-compose.mongodb.yml
+++ b/docker-compose.mongodb.yml
@ -15,7 +15,7 @@ services:

  mongo:
    image: mongo:4.4.1
-    command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet}
+    command: --keyFile=/data/mgkey --replSet=${SKYNET_DB_REPLICASET:-skynet} --setParameter ShardingTaskExecutorPoolMinSize=10
    container_name: mongo
    restart: unless-stopped
    logging: *default-logging
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -22,6 +22,7 @@ services:
        branch: portal-latest
    container_name: sia
    restart: unless-stopped
+    stop_grace_period: 5m
    logging: *default-logging
    environment:
      - SIA_MODULES=gctwra
@ -54,9 +55,11 @@ services:
      - ./docker/data/certbot:/etc/letsencrypt

  nginx:
-    build:
-      context: ./docker/nginx
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./docker/nginx/Dockerfile
+    image: skynetlabs/nginx
    container_name: nginx
    restart: unless-stopped
    logging: *default-logging
@ -69,6 +72,10 @@ services:
      - ./docker/data/nginx/skynet:/data/nginx/skynet:ro
      - ./docker/data/sia/apipassword:/data/sia/apipassword:ro
      - ./docker/data/certbot:/etc/letsencrypt
+      - ./docker/nginx/libs:/etc/nginx/libs
+      - ./docker/nginx/conf.d:/etc/nginx/conf.d
+      - ./docker/nginx/conf.d.templates:/etc/nginx/templates
+      - ./docker/nginx/nginx.conf:/usr/local/openresty/nginx/conf/nginx.conf
    networks:
      shared:
        ipv4_address: 10.10.10.30
--- a/docker/nginx/Dockerfile
+++ b/docker/nginx/Dockerfile
@ -2,25 +2,20 @@ FROM openresty/openresty:1.19.9.1-focal

 WORKDIR /

-RUN luarocks install lua-resty-http && \
-    luarocks install hasher && \
-    openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \
-    -subj '/CN=local-certificate' \
-    -keyout /etc/ssl/local-certificate.key \
-    -out /etc/ssl/local-certificate.crt
+RUN apt-get update && apt-get --no-install-recommends -y install bc=1.07.1-2build1 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    luarocks install lua-resty-http && \
+    luarocks install hasher

-COPY mo ./
-COPY libs /etc/nginx/libs
-COPY conf.d /etc/nginx/conf.d
-COPY conf.d.templates /etc/nginx/conf.d.templates
-COPY nginx.conf /usr/local/openresty/nginx/conf/nginx.conf
+# reload nginx every 6 hours (for reloading certificates)
+ENV NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS 6

-CMD [ "bash", "-c", \
-      "./mo < /etc/nginx/conf.d.templates/server.account.conf > /etc/nginx/conf.d/server.account.conf ; \
-       ./mo < /etc/nginx/conf.d.templates/server.api.conf > /etc/nginx/conf.d/server.api.conf; \
-       ./mo < /etc/nginx/conf.d.templates/server.dnslink.conf > /etc/nginx/conf.d/server.dnslink.conf; \
-       ./mo < /etc/nginx/conf.d.templates/server.hns.conf > /etc/nginx/conf.d/server.hns.conf; \
-       ./mo < /etc/nginx/conf.d.templates/server.skylink.conf > /etc/nginx/conf.d/server.skylink.conf ; \
-       while :; do sleep 6h & wait ${!}; /usr/local/openresty/bin/openresty -s reload; done & \
-       /usr/local/openresty/bin/openresty '-g daemon off;'" \
-    ]
+# copy entrypoint and entrypoint scripts
+COPY docker/nginx/docker-entrypoint.sh /
+COPY docker/nginx/docker-entrypoint.d /docker-entrypoint.d
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+STOPSIGNAL SIGQUIT
+
+CMD ["nginx", "-g", "daemon off;"]
--- a/docker/nginx/conf.d.templates/server.account.conf
+++ b/docker/nginx/conf.d.templates/server.account.conf
@ -1,45 +0,0 @@
-{{#ACCOUNTS_ENABLED}}
-	{{#PORTAL_DOMAIN}}
-	server {
-		server_name account.{{PORTAL_DOMAIN}}; # example: account.siasky.net
-		
-		include /etc/nginx/conf.d/server/server.http;
-	}
-
-	server {
-		server_name account.{{PORTAL_DOMAIN}}; # example: account.siasky.net
-
-		set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-		set_by_lua_block $skynet_server_domain {
-			-- fall back to portal domain if server domain is not defined
-			if "{{SERVER_DOMAIN}}" == "" then
-				return "{{PORTAL_DOMAIN}}"
-			end
-			return "{{SERVER_DOMAIN}}"
-		}
-
-		include /etc/nginx/conf.d/server/server.account;
-	}
-	{{/PORTAL_DOMAIN}}
-
-	{{#SERVER_DOMAIN}}
-	server {
-		server_name account.{{SERVER_DOMAIN}}; # example: account.eu-ger-1.siasky.net
-
-		include /etc/nginx/conf.d/server/server.http;
-
-		set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-	}
-
-	server {
-		server_name account.{{SERVER_DOMAIN}}; # example: account.eu-ger-1.siasky.net
-
-		set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-		set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-
-		include /etc/nginx/conf.d/server/server.account;
-		
-		set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-	}
-	{{/SERVER_DOMAIN}}
-{{/ACCOUNTS_ENABLED}}
--- a/docker/nginx/conf.d.templates/server.account.conf.template
+++ b/docker/nginx/conf.d.templates/server.account.conf.template
@ -0,0 +1,44 @@
+server {
+	server_name account.${PORTAL_DOMAIN}; # example: account.siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name account.${PORTAL_DOMAIN}; # example: account.siasky.net
+
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	include /etc/nginx/conf.d/server/server.account;
+}
+
+server {
+	server_name account.${SERVER_DOMAIN}; # example: account.eu-ger-1.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name account.${SERVER_DOMAIN}; # example: account.eu-ger-1.siasky.net
+
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+
+	include /etc/nginx/conf.d/server/server.account;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
--- a/docker/nginx/conf.d.templates/server.api.conf
+++ b/docker/nginx/conf.d.templates/server.api.conf
@ -1,43 +0,0 @@
-{{#PORTAL_DOMAIN}}
-server {
-	server_name {{PORTAL_DOMAIN}}; # example: siasky.net
-	
-	include /etc/nginx/conf.d/server/server.http;
-}
-
-server {
-	server_name {{PORTAL_DOMAIN}}; # example: siasky.net
-
-	set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain {
-		-- fall back to portal domain if server domain is not defined
-		if "{{SERVER_DOMAIN}}" == "" then
-			return "{{PORTAL_DOMAIN}}"
-		end
-		return "{{SERVER_DOMAIN}}"
-	}
-
-	include /etc/nginx/conf.d/server/server.api;
-}
-{{/PORTAL_DOMAIN}}
-
-{{#SERVER_DOMAIN}}
-server {
-	server_name {{SERVER_DOMAIN}}; # example: eu-ger-1.siasky.net
-
-	include /etc/nginx/conf.d/server/server.http;
-
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-
-server {
-	server_name {{SERVER_DOMAIN}}; # example: eu-ger-1.siasky.net
-
-	set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-
-	include /etc/nginx/conf.d/server/server.api;
-	
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-{{/SERVER_DOMAIN}}
--- a/docker/nginx/conf.d.templates/server.api.conf.template
+++ b/docker/nginx/conf.d.templates/server.api.conf.template
@ -0,0 +1,44 @@
+server {
+	server_name ${PORTAL_DOMAIN}; # example: siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name ${PORTAL_DOMAIN}; # example: siasky.net
+
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	include /etc/nginx/conf.d/server/server.api;
+}
+
+server {
+	server_name ${SERVER_DOMAIN}; # example: eu-ger-1.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name ${SERVER_DOMAIN}; # example: eu-ger-1.siasky.net
+
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+
+	include /etc/nginx/conf.d/server/server.api;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
--- a/docker/nginx/conf.d.templates/server.dnslink.conf.template
+++ b/docker/nginx/conf.d.templates/server.dnslink.conf.template
@ -12,13 +12,13 @@ server {
    ssl_certificate     /etc/ssl/local-certificate.crt;
    ssl_certificate_key /etc/ssl/local-certificate.key;

-    set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
+    set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
    set_by_lua_block $skynet_server_domain {
        -- fall back to portal domain if server domain is not defined
-        if "{{SERVER_DOMAIN}}" == "" then
-            return "{{PORTAL_DOMAIN}}"
+        if "${SERVER_DOMAIN}" == "" then
+            return "${PORTAL_DOMAIN}"
        end
-        return "{{SERVER_DOMAIN}}"
+        return "${SERVER_DOMAIN}"
    }

    include /etc/nginx/conf.d/server/server.dnslink;
--- a/docker/nginx/conf.d.templates/server.hns.conf
+++ b/docker/nginx/conf.d.templates/server.hns.conf
@ -1,45 +0,0 @@
-{{#PORTAL_DOMAIN}}
-server {
-	server_name *.hns.{{PORTAL_DOMAIN}}; # example: *.hns.siasky.net
-	
-	include /etc/nginx/conf.d/server/server.http;
-}
-
-server {
-	server_name *.hns.{{PORTAL_DOMAIN}}; # example: *.hns.siasky.net
-	
-	set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain {
-		-- fall back to portal domain if server domain is not defined
-		if "{{SERVER_DOMAIN}}" == "" then
-			return "{{PORTAL_DOMAIN}}"
-		end
-		return "{{SERVER_DOMAIN}}"
-	}
-
-	proxy_set_header Host {{PORTAL_DOMAIN}};
-	include /etc/nginx/conf.d/server/server.hns;
-}
-{{/PORTAL_DOMAIN}}
-
-{{#SERVER_DOMAIN}}
-server {
-	server_name *.hns.{{SERVER_DOMAIN}}; # example: *.hns.eu-ger-1.siasky.net
-	
-	include /etc/nginx/conf.d/server/server.http;
-
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-
-server {
-	server_name *.hns.{{SERVER_DOMAIN}}; # example: *.hns.eu-ger-1.siasky.net
-	
-	set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-    
-	proxy_set_header Host {{SERVER_DOMAIN}};
-	include /etc/nginx/conf.d/server/server.hns;
-	
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-{{/SERVER_DOMAIN}}
--- a/docker/nginx/conf.d.templates/server.hns.conf.template
+++ b/docker/nginx/conf.d.templates/server.hns.conf.template
@ -0,0 +1,46 @@
+server {
+	server_name *.hns.${PORTAL_DOMAIN}; # example: *.hns.siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name *.hns.${PORTAL_DOMAIN}; # example: *.hns.siasky.net
+	
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	proxy_set_header Host ${PORTAL_DOMAIN};
+	include /etc/nginx/conf.d/server/server.hns;
+}
+
+server {
+	server_name *.hns.${SERVER_DOMAIN}; # example: *.hns.eu-ger-1.siasky.net
+	
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name *.hns.${SERVER_DOMAIN}; # example: *.hns.eu-ger-1.siasky.net
+	
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+    
+	proxy_set_header Host ${SERVER_DOMAIN};
+	include /etc/nginx/conf.d/server/server.hns;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
--- a/docker/nginx/conf.d.templates/server.skylink.conf
+++ b/docker/nginx/conf.d.templates/server.skylink.conf
@ -1,43 +0,0 @@
-{{#PORTAL_DOMAIN}}
-server {
-	server_name *.{{PORTAL_DOMAIN}}; # example: *.siasky.net
-
-	include /etc/nginx/conf.d/server/server.http;
-}
-
-server {
-	server_name *.{{PORTAL_DOMAIN}}; # example: *.siasky.net
-	
-	set_by_lua_block $skynet_portal_domain { return "{{PORTAL_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain {
-		-- fall back to portal domain if server domain is not defined
-		if "{{SERVER_DOMAIN}}" == "" then
-			return "{{PORTAL_DOMAIN}}"
-		end
-		return "{{SERVER_DOMAIN}}"
-	}
-
-	include /etc/nginx/conf.d/server/server.skylink;
-}
-{{/PORTAL_DOMAIN}}
-
-{{#SERVER_DOMAIN}}
-server {
-	server_name *.{{SERVER_DOMAIN}}; # example: *.eu-ger-1.siasky.net
-
-	include /etc/nginx/conf.d/server/server.http;
-
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-
-server {
-	server_name *.{{SERVER_DOMAIN}}; # example: *.eu-ger-1.siasky.net
-
-	set_by_lua_block $skynet_portal_domain { return "{{SERVER_DOMAIN}}" }
-	set_by_lua_block $skynet_server_domain { return "{{SERVER_DOMAIN}}" }
-	
-	include /etc/nginx/conf.d/server/server.skylink;
-	
-	set_by_lua_block $server_alias { return string.match("{{SERVER_DOMAIN}}", "^([^.]+)") }
-}
-{{/SERVER_DOMAIN}}
--- a/docker/nginx/conf.d.templates/server.skylink.conf.template
+++ b/docker/nginx/conf.d.templates/server.skylink.conf.template
@ -0,0 +1,44 @@
+server {
+	server_name *.${PORTAL_DOMAIN}; # example: *.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+}
+
+server {
+	server_name *.${PORTAL_DOMAIN}; # example: *.siasky.net
+	
+	set_by_lua_block $skynet_portal_domain { return "${PORTAL_DOMAIN}" }
+	set_by_lua_block $skynet_server_domain {
+		-- fall back to portal domain if server domain is not defined
+		if "${SERVER_DOMAIN}" == "" then
+			return "${PORTAL_DOMAIN}"
+		end
+		return "${SERVER_DOMAIN}"
+	}
+
+	include /etc/nginx/conf.d/server/server.skylink;
+}
+
+server {
+	server_name *.${SERVER_DOMAIN}; # example: *.eu-ger-1.siasky.net
+
+	include /etc/nginx/conf.d/server/server.http;
+
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
+
+server {
+	server_name *.${SERVER_DOMAIN}; # example: *.eu-ger-1.siasky.net
+
+	set_by_lua_block $skynet_portal_domain {
+		-- when accessing portal directly through server domain, portal domain should be set to server domain
+		-- motivation: skynet-js uses Skynet-Portal-Api header (that is set to $skynet_portal_domain) to detect current
+		-- portal address and it should be server domain when accessing specific server by its domain address
+		return "${SERVER_DOMAIN}"
+	}
+	set_by_lua_block $skynet_server_domain { return "${SERVER_DOMAIN}" }
+	
+	include /etc/nginx/conf.d/server/server.skylink;
+	
+	set_by_lua_block $server_alias { return string.match("${SERVER_DOMAIN}", "^([^.]+)") }
+}
--- a/docker/nginx/conf.d/server/server.api
+++ b/docker/nginx/conf.d/server/server.api
@ -235,7 +235,12 @@ location /skynet/skyfile {
        local skynet_tracker = require("skynet.tracker")

        if skynet_modules.is_enabled("a") then
-            skynet_tracker.track_upload(ngx.header["Skynet-Skylink"], ngx.status, skynet_account.get_auth_headers())
+            skynet_tracker.track_upload(
+                ngx.header["Skynet-Skylink"],
+                ngx.status,
+                skynet_account.get_auth_headers(),
+                ngx.var.remote_addr
+            )
        end

        if skynet_modules.is_enabled("s") then
@ -315,7 +320,12 @@ location /skynet/tus {
        local skynet_tracker = require("skynet.tracker")

        if skynet_modules.is_enabled("a") then
-            skynet_tracker.track_upload(ngx.header["Skynet-Skylink"], ngx.status, skynet_account.get_auth_headers())
+            skynet_tracker.track_upload(
+                ngx.header["Skynet-Skylink"],
+                ngx.status,
+                skynet_account.get_auth_headers(),
+                ngx.var.remote_addr
+            )
        end

        if skynet_modules.is_enabled("s") then
@ -346,7 +356,12 @@ location /skynet/pin {
        local skynet_tracker = require("skynet.tracker")

        if skynet_modules.is_enabled("a") then
-            skynet_tracker.track_upload(ngx.header["Skynet-Skylink"], ngx.status, skynet_account.get_auth_headers())
+            skynet_tracker.track_upload(
+                ngx.header["Skynet-Skylink"],
+                ngx.status,
+                skynet_account.get_auth_headers(),
+                ngx.var.remote_addr
+            )
        end

        if skynet_modules.is_enabled("s") then
--- a/docker/nginx/docker-entrypoint.d/20-envsubst-on-templates.sh
+++ b/docker/nginx/docker-entrypoint.d/20-envsubst-on-templates.sh
@ -0,0 +1,59 @@
+#!/bin/sh
+
+# https://github.com/nginxinc/docker-nginx/blob/master/entrypoint/20-envsubst-on-templates.sh
+# https://github.com/nginxinc/docker-nginx/blob/master/LICENSE
+
+# Copyright (C) 2011-2016 Nginx, Inc.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+ME=$(basename $0)
+
+auto_envsubst() {
+  local template_dir="${NGINX_ENVSUBST_TEMPLATE_DIR:-/etc/nginx/templates}"
+  local suffix="${NGINX_ENVSUBST_TEMPLATE_SUFFIX:-.template}"
+  local output_dir="${NGINX_ENVSUBST_OUTPUT_DIR:-/etc/nginx/conf.d}"
+
+  local template defined_envs relative_path output_path subdir
+  defined_envs=$(printf '${%s} ' $(env | cut -d= -f1))
+  [ -d "$template_dir" ] || return 0
+  if [ ! -w "$output_dir" ]; then
+    echo >&3 "$ME: ERROR: $template_dir exists, but $output_dir is not writable"
+    return 0
+  fi
+  find "$template_dir" -follow -type f -name "*$suffix" -print | while read -r template; do
+    relative_path="${template#$template_dir/}"
+    output_path="$output_dir/${relative_path%$suffix}"
+    subdir=$(dirname "$relative_path")
+    # create a subdirectory where the template file exists
+    mkdir -p "$output_dir/$subdir"
+    echo >&3 "$ME: Running envsubst on $template to $output_path"
+    envsubst "$defined_envs" < "$template" > "$output_path"
+  done
+}
+
+auto_envsubst
+
+exit 0
--- a/docker/nginx/docker-entrypoint.d/40-reload-every-x-hours.sh
+++ b/docker/nginx/docker-entrypoint.d/40-reload-every-x-hours.sh
@ -0,0 +1,20 @@
+#!/bin/sh
+
+# source: https://github.com/nginxinc/docker-nginx/pull/509
+
+set -e
+
+ME=$(basename $0)
+
+[ "${NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS:-}" ] || exit 0
+if [ $(echo "$NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS > 0" | bc) = 0 ]; then
+  echo >&3 "$ME: Error. Provide integer or floating point number greater that 0. See 'man sleep'." 
+  exit 1
+fi
+
+start_background_reload() {
+  echo >&3 "$ME: Reloading Nginx every $NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS hour(s)"
+  while :; do sleep ${NGINX_ENTRYPOINT_RELOAD_EVERY_X_HOURS}h; echo >&3 "$ME: Reloading Nginx ..." && nginx -s reload; done &
+}
+
+start_background_reload
--- a/docker/nginx/docker-entrypoint.d/50-generate-local-certificate.sh
+++ b/docker/nginx/docker-entrypoint.d/50-generate-local-certificate.sh
@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Generate locally signed ssl certificate to be used on routes
+# that do not require certificate issued by trusted CA
+
+set -e
+
+ME=$(basename $0)
+
+generate_local_certificate() {
+  echo >&3 "$ME: Generating locally signed ssl certificate"
+  openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \
+    -subj '/CN=local-certificate' \
+    -keyout /etc/ssl/local-certificate.key \
+    -out /etc/ssl/local-certificate.crt
+}
+
+generate_local_certificate
--- a/docker/nginx/docker-entrypoint.sh
+++ b/docker/nginx/docker-entrypoint.sh
@ -0,0 +1,65 @@
+#!/bin/sh
+# vim:sw=4:ts=4:et
+
+# https://github.com/nginxinc/docker-nginx/blob/master/entrypoint/docker-entrypoint.sh
+# https://github.com/nginxinc/docker-nginx/blob/master/LICENSE
+
+# Copyright (C) 2011-2016 Nginx, Inc.
+# All rights reserved.
+
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+set -e
+
+if [ -z "${NGINX_ENTRYPOINT_QUIET_LOGS:-}" ]; then
+    exec 3>&1
+else
+    exec 3>/dev/null
+fi
+
+if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then
+    if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then
+        echo >&3 "$0: /docker-entrypoint.d/ is not empty, will attempt to perform configuration"
+
+        echo >&3 "$0: Looking for shell scripts in /docker-entrypoint.d/"
+        find "/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
+            case "$f" in
+                *.sh)
+                    if [ -x "$f" ]; then
+                        echo >&3 "$0: Launching $f";
+                        "$f"
+                    else
+                        # warn on shell scripts without exec bit
+                        echo >&3 "$0: Ignoring $f, not executable";
+                    fi
+                    ;;
+                *) echo >&3 "$0: Ignoring $f";;
+            esac
+        done
+
+        echo >&3 "$0: Configuration complete; ready for start up"
+    else
+        echo >&3 "$0: No files found in /docker-entrypoint.d/, skipping configuration"
+    fi
+fi
+
+exec "$@"
--- a/docker/nginx/libs/skynet/account.lua
+++ b/docker/nginx/libs/skynet/account.lua
@ -76,9 +76,16 @@ function _M.get_account_limits()

    if ngx.var.account_limits == "" then
        local httpc = require("resty.http").new()
+        local uri = "http://10.10.10.70:3000/user/limits"
+
+        -- include skylink if it is available in the context of request
+        -- todo: this should not rely on skylink variable to be defined
+        if ngx.var.skylink ~= nil and ngx.var.skylink ~= "" then
+            uri = uri .. "/" .. ngx.var.skylink
+        end

        -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
-        local res, err = httpc:request_uri("http://10.10.10.70:3000/user/limits?unit=byte", {
+        local res, err = httpc:request_uri(uri .. "?unit=byte", {
            headers = auth_headers,
        })

--- a/docker/nginx/libs/skynet/tracker.lua
+++ b/docker/nginx/libs/skynet/tracker.lua
@ -30,15 +30,24 @@ function _M.track_download(skylink, status_code, auth_headers, body_bytes_sent)
    end
 end

-function _M.track_upload_timer(premature, skylink, auth_headers)
+function _M.track_upload_timer(premature, skylink, auth_headers, uploader_ip)
    if premature then return end

    local httpc = require("resty.http").new()

+    -- set correct content type header and include auth headers
+    local headers = {
+        ["Content-Type"] = "application/x-www-form-urlencoded",
+    }
+    for key, value in pairs(auth_headers) do
+        headers[key] = value
+    end
+
    -- 10.10.10.70 points to accounts service (alias not available when using resty-http)
    local res, err = httpc:request_uri("http://10.10.10.70:3000/track/upload/" .. skylink, {
        method = "POST",
-        headers = auth_headers,
+        headers = headers,
+        body = "ip=" .. uploader_ip,
    })

    if err or (res and res.status ~= 204) then
@ -47,12 +56,11 @@ function _M.track_upload_timer(premature, skylink, auth_headers)
    end
 end

-function _M.track_upload(skylink, status_code, auth_headers)
-    local has_auth_headers = not utils.is_table_empty(auth_headers)
+function _M.track_upload(skylink, status_code, auth_headers, uploader_ip)
    local status_success = status_code >= 200 and status_code <= 299

-    if skylink and status_success and has_auth_headers then
-        local ok, err = ngx.timer.at(0, _M.track_upload_timer, skylink, auth_headers)
+    if skylink and status_success then
+        local ok, err = ngx.timer.at(0, _M.track_upload_timer, skylink, auth_headers, uploader_ip)
        if not ok then ngx.log(ngx.ERR, "Failed to create timer: ", err) end
    end
 end
--- a/docker/nginx/libs/skynet/tracker.spec.lua
+++ b/docker/nginx/libs/skynet/tracker.spec.lua
@ -5,6 +5,7 @@ local skynet_tracker = require("skynet.tracker")
 local valid_skylink = "AQBG8n_sgEM_nlEp3G0w3vLjmdvSZ46ln8ZXHn-eObZNjA"
 local valid_status_code = 200
 local valid_auth_headers = { ["Skynet-Api-Key"] = "foo" }
+local valid_ip = "12.34.56.78"

 describe("track_download", function()
    local valid_body_bytes_sent = 12345
@ -200,20 +201,21 @@ describe("track_upload", function()
    it("should schedule a timer when conditions are met", function()
        ngx.timer.at.invokes(function() return true, nil end)

-        skynet_tracker.track_upload(valid_skylink, valid_status_code, valid_auth_headers)
+        skynet_tracker.track_upload(valid_skylink, valid_status_code, valid_auth_headers, valid_ip)

        assert.stub(ngx.timer.at).was_called_with(
            0,
            skynet_tracker.track_upload_timer,
            valid_skylink,
-            valid_auth_headers
+            valid_auth_headers,
+            valid_ip
        )
    end)

    it("should not schedule a timer if skylink is empty", function()
        ngx.timer.at.invokes(function() return true, nil end)

-        skynet_tracker.track_upload(nil, valid_status_code, valid_auth_headers)
+        skynet_tracker.track_upload(nil, valid_status_code, valid_auth_headers, valid_ip)

        assert.stub(ngx.timer.at).was_not_called()
    end)
@ -222,34 +224,41 @@ describe("track_upload", function()
        ngx.timer.at.invokes(function() return true, nil end)

        -- couple of example of 4XX and 5XX codes
-        skynet_tracker.track_upload(valid_skylink, 401, valid_auth_headers)
-        skynet_tracker.track_upload(valid_skylink, 403, valid_auth_headers)
-        skynet_tracker.track_upload(valid_skylink, 490, valid_auth_headers)
-        skynet_tracker.track_upload(valid_skylink, 500, valid_auth_headers)
-        skynet_tracker.track_upload(valid_skylink, 502, valid_auth_headers)
+        skynet_tracker.track_upload(valid_skylink, 401, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 403, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 490, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 500, valid_auth_headers, valid_ip)
+        skynet_tracker.track_upload(valid_skylink, 502, valid_auth_headers, valid_ip)

        assert.stub(ngx.timer.at).was_not_called()
    end)

-    it("should not schedule a timer if auth headers are empty", function()
+    it("should schedule a timer if auth headers are empty", function()
        ngx.timer.at.invokes(function() return true, nil end)

-        skynet_tracker.track_upload(valid_skylink, valid_status_code, {})
+        skynet_tracker.track_upload(valid_skylink, valid_status_code, {}, valid_ip)

-        assert.stub(ngx.timer.at).was_not_called()
+        assert.stub(ngx.timer.at).was_called_with(
+            0,
+            skynet_tracker.track_upload_timer,
+            valid_skylink,
+            {},
+            valid_ip
+        )
    end)

    it("should log an error if timer failed to create", function()
        stub(ngx, "log")
        ngx.timer.at.invokes(function() return false, "such a failure" end)

-        skynet_tracker.track_upload(valid_skylink, valid_status_code, valid_auth_headers)
+        skynet_tracker.track_upload(valid_skylink, valid_status_code, valid_auth_headers, valid_ip)

        assert.stub(ngx.timer.at).was_called_with(
            0,
            skynet_tracker.track_upload_timer,
            valid_skylink,
-            valid_auth_headers
+            valid_auth_headers,
+            valid_ip
        )
        assert.stub(ngx.log).was_called_with(ngx.ERR, "Failed to create timer: ", "such a failure")

@ -279,7 +288,8 @@ describe("track_upload", function()
            skynet_tracker.track_upload_timer(
                true,
                valid_skylink,
-                valid_auth_headers
+                valid_auth_headers,
+                valid_ip
            )

            assert.stub(request_uri).was_not_called()
@ -297,11 +307,19 @@ describe("track_upload", function()
            skynet_tracker.track_upload_timer(
                false,
                valid_skylink,
-                valid_auth_headers
+                valid_auth_headers,
+                valid_ip
            )

            local uri = "http://10.10.10.70:3000/track/upload/" .. valid_skylink
-            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(request_uri).was_called_with(httpc, uri, {
+                method = "POST",
+                headers = {
+                    ["Content-Type"] = "application/x-www-form-urlencoded",
+                    ["Skynet-Api-Key"] = "foo",
+                },
+                body = "ip=" .. valid_ip
+            })
            assert.stub(ngx.log).was_not_called()
        end)

@ -316,11 +334,19 @@ describe("track_upload", function()
            skynet_tracker.track_upload_timer(
                false,
                valid_skylink,
-                valid_auth_headers
+                valid_auth_headers,
+                valid_ip
            )

            local uri = "http://10.10.10.70:3000/track/upload/" .. valid_skylink
-            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(request_uri).was_called_with(httpc, uri, {
+                method = "POST",
+                headers = {
+                    ["Content-Type"] = "application/x-www-form-urlencoded",
+                    ["Skynet-Api-Key"] = "foo",
+                },
+                body = "ip=" .. valid_ip
+            })
            assert.stub(ngx.log).was_called_with(
                ngx.ERR,
                "Failed accounts service request /track/upload/" .. valid_skylink .. ": ",
@ -339,11 +365,19 @@ describe("track_upload", function()
            skynet_tracker.track_upload_timer(
                false,
                valid_skylink,
-                valid_auth_headers
+                valid_auth_headers,
+                valid_ip
            )

            local uri = "http://10.10.10.70:3000/track/upload/" .. valid_skylink
-            assert.stub(request_uri).was_called_with(httpc, uri, { method = "POST", headers = valid_auth_headers })
+            assert.stub(request_uri).was_called_with(httpc, uri, {
+                method = "POST",
+                headers = {
+                    ["Content-Type"] = "application/x-www-form-urlencoded",
+                    ["Skynet-Api-Key"] = "foo",
+                },
+                body = "ip=" .. valid_ip
+            })
            assert.stub(ngx.log).was_called_with(
                ngx.ERR,
                "Failed accounts service request /track/upload/" .. valid_skylink .. ": ",
--- a/docker/nginx/mo
+++ b/docker/nginx/mo
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@ -19,6 +19,9 @@
 user root;
 worker_processes auto;

+# Enables the use of JIT for regular expressions to speed-up their processing.
+pcre_jit on;
+
 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;
--- a/docker/nginx/testing/Dockerfile
+++ b/docker/nginx/testing/Dockerfile
@ -8,4 +8,4 @@ RUN luarocks install lua-resty-http && \

 COPY rbusted /etc/nginx/

-CMD /etc/nginx/rbusted --verbose --pattern=spec /usr/local/openresty/site/lualib
+CMD ["/etc/nginx/rbusted", "--verbose", "--pattern=spec", "/usr/local/openresty/site/lualib"]
--- a/packages/dashboard-v2/Dockerfile
+++ b/packages/dashboard-v2/Dockerfile
@ -2,13 +2,17 @@ FROM node:16.14.2-alpine

 WORKDIR /usr/app

-COPY package.json yarn.lock ./
+COPY package.json \
+     yarn.lock \
+     ./

 RUN yarn --frozen-lockfile

 COPY static ./static
 COPY src ./src
-COPY gatsby*.js ./
-COPY postcss.config.js tailwind.config.js ./
+COPY gatsby*.js \
+     postcss.config.js \
+     tailwind.config.js \
+     ./

 CMD ["sh", "-c", "yarn build && yarn serve --host 0.0.0.0 -p 9000"]
--- a/packages/dashboard-v2/src/contexts/plans/PlansProvider.js
+++ b/packages/dashboard-v2/src/contexts/plans/PlansProvider.js
@ -19,16 +19,14 @@ const aggregatePlansAndLimits = (plans, limits, { includeFreePlan }) => {

  // Decorate each plan with its corresponding limits data, if available.
  if (limits?.length) {
-    return limits
-      .map((limitsDescriptor, index) => {
-        const asssociatedPlan = sortedPlans.find((plan) => plan.tier === index) || {};
+    return limits.map((limitsDescriptor, index) => {
+      const asssociatedPlan = sortedPlans.find((plan) => plan.tier === index) || {};

-        return {
-          ...asssociatedPlan,
-          limits: limitsDescriptor || null,
-        };
-      })
-      .slice(includeFreePlan ? 1 : 2);
+      return {
+        ...asssociatedPlan,
+        limits: limitsDescriptor || null,
+      };
+    });
  }

  // If we don't have the limits data yet, set just return the plans.
--- a/packages/dashboard/Dockerfile
+++ b/packages/dashboard/Dockerfile
@ -2,14 +2,19 @@ FROM node:16.14.2-alpine

 WORKDIR /usr/app

-COPY package.json yarn.lock ./
+COPY packages/dashboard/package.json \
+     packages/dashboard/yarn.lock \
+     ./

 ENV NEXT_TELEMETRY_DISABLED 1
 RUN yarn --frozen-lockfile

-COPY public ./public
-COPY src ./src
-COPY styles ./styles
-COPY .eslintrc.json postcss.config.js tailwind.config.js ./
+COPY packages/dashboard/public ./public
+COPY packages/dashboard/src ./src
+COPY packages/dashboard/styles ./styles
+COPY packages/dashboard/.eslintrc.json \
+     packages/dashboard/postcss.config.js \
+     packages/dashboard/tailwind.config.js \
+     ./

 CMD ["sh", "-c", "env | grep -E 'NEXT_PUBLIC|STRIPE|ACCOUNTS' > .env.local && yarn build && yarn start"]
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@ -8,37 +8,37 @@
    "start": "next start"
  },
  "dependencies": {
-    "@fontsource/sora": "4.5.5",
-    "@fontsource/source-sans-pro": "4.5.6",
-    "@stripe/react-stripe-js": "1.7.1",
-    "@stripe/stripe-js": "1.27.0",
+    "@fontsource/sora": "4.5.8",
+    "@fontsource/source-sans-pro": "4.5.9",
+    "@stripe/react-stripe-js": "1.7.2",
+    "@stripe/stripe-js": "1.29.0",
    "classnames": "2.3.1",
    "copy-text-to-clipboard": "^3.0.1",
-    "dayjs": "1.11.0",
-    "express-jwt": "6.1.1",
+    "dayjs": "1.11.1",
+    "express-jwt": "7.6.2",
    "fast-levenshtein": "3.0.0",
    "formik": "2.2.9",
    "http-status-codes": "2.2.0",
    "ky": "0.30.0",
-    "next": "12.1.4",
+    "next": "12.1.6",
    "normalize.css": "8.0.1",
    "pretty-bytes": "6.0.0",
    "react": "17.0.2",
    "react-dom": "17.0.2",
-    "react-toastify": "8.2.0",
+    "react-toastify": "9.0.0",
    "skynet-js": "3.0.2",
-    "stripe": "8.216.0",
+    "stripe": "8.220.0",
    "swr": "1.3.0",
    "yup": "0.32.11"
  },
  "devDependencies": {
-    "@tailwindcss/forms": "0.5.0",
+    "@tailwindcss/forms": "0.5.1",
    "@tailwindcss/typography": "0.5.2",
-    "autoprefixer": "10.4.4",
-    "eslint": "8.13.0",
-    "eslint-config-next": "12.1.4",
-    "postcss": "8.4.12",
+    "autoprefixer": "10.4.7",
+    "eslint": "8.14.0",
+    "eslint-config-next": "12.1.6",
+    "postcss": "8.4.13",
    "prettier": "2.6.2",
-    "tailwindcss": "3.0.23"
+    "tailwindcss": "3.0.24"
  }
 }
--- a/packages/dashboard/yarn.lock
+++ b/packages/dashboard/yarn.lock
--- a/packages/dnslink-api/package.json
+++ b/packages/dnslink-api/package.json
@ -4,7 +4,7 @@
  "main": "index.js",
  "license": "SEE LICENSE IN LICENSE.md",
  "dependencies": {
-    "express": "^4.17.3",
+    "express": "^4.18.1",
    "is-valid-domain": "^0.1.6"
  },
  "devDependencies": {
--- a/packages/dnslink-api/yarn.lock
+++ b/packages/dnslink-api/yarn.lock
@ -15,27 +15,37 @@ array-flatten@1.1.1:
  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=

-body-parser@1.19.2:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
-  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+body-parser@1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
+  integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
  dependencies:
    bytes "3.1.2"
    content-type "~1.0.4"
    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.7"
-    raw-body "2.4.3"
+    on-finished "2.4.1"
+    qs "6.10.3"
+    raw-body "2.5.1"
    type-is "~1.6.18"
+    unpipe "1.0.0"

 bytes@3.1.2:
  version "3.1.2"
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==

+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 content-disposition@0.5.4:
  version "0.5.4"
  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@ -53,10 +63,10 @@ cookie-signature@1.0.6:
  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=

-cookie@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==

 debug@2.6.9:
  version "2.6.9"
@ -65,15 +75,15 @@ debug@2.6.9:
  dependencies:
    ms "2.0.0"

-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==

-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==

 ee-first@1.1.1:
  version "1.1.1"
@ -95,53 +105,54 @@ etag@~1.8.1:
  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=

-express@^4.17.3:
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
-  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+express@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
+  integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
  dependencies:
    accepts "~1.3.8"
    array-flatten "1.1.1"
-    body-parser "1.19.2"
+    body-parser "1.20.0"
    content-disposition "0.5.4"
    content-type "~1.0.4"
-    cookie "0.4.2"
+    cookie "0.5.0"
    cookie-signature "1.0.6"
    debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
    fresh "0.5.2"
+    http-errors "2.0.0"
    merge-descriptors "1.0.1"
    methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
    parseurl "~1.3.3"
    path-to-regexp "0.1.7"
    proxy-addr "~2.0.7"
-    qs "6.9.7"
+    qs "6.10.3"
    range-parser "~1.2.1"
    safe-buffer "5.2.1"
-    send "0.17.2"
-    serve-static "1.14.2"
+    send "0.18.0"
+    serve-static "1.15.0"
    setprototypeof "1.2.0"
-    statuses "~1.5.0"
+    statuses "2.0.1"
    type-is "~1.6.18"
    utils-merge "1.0.1"
    vary "~1.1.2"

-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
  dependencies:
    debug "2.6.9"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
    parseurl "~1.3.3"
-    statuses "~1.5.0"
+    statuses "2.0.1"
    unpipe "~1.0.0"

 forwarded@0.2.0:
@ -154,15 +165,41 @@ fresh@0.5.2:
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=

-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
  dependencies:
-    depd "~1.1.2"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+has-symbols@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+  dependencies:
+    depd "2.0.0"
    inherits "2.0.4"
    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
+    statuses "2.0.1"
    toidentifier "1.0.1"

 iconv-lite@0.4.24:
@ -248,10 +285,15 @@ negotiator@0.6.3:
  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==

-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+object-inspect@^1.9.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
+  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
  dependencies:
    ee-first "1.1.1"

@ -283,23 +325,25 @@ punycode@^2.1.1:
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

-qs@6.9.7:
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
-  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+qs@6.10.3:
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+  dependencies:
+    side-channel "^1.0.4"

 range-parser@~1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==

-raw-body@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
-  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
  dependencies:
    bytes "3.1.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
    iconv-lite "0.4.24"
    unpipe "1.0.0"

@ -313,44 +357,53 @@ safe-buffer@5.2.1:
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-send@0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
-  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
  dependencies:
    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
+    depd "2.0.0"
+    destroy "1.2.0"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    etag "~1.8.1"
    fresh "0.5.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
    mime "1.6.0"
    ms "2.1.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
    range-parser "~1.2.1"
-    statuses "~1.5.0"
+    statuses "2.0.1"

-serve-static@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
-  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
  dependencies:
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    parseurl "~1.3.3"
-    send "0.17.2"
+    send "0.18.0"

 setprototypeof@1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

-"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==

 toidentifier@1.0.1:
  version "1.0.1"
--- a/packages/handshake-api/package.json
+++ b/packages/handshake-api/package.json
@ -4,7 +4,7 @@
  "main": "index.js",
  "license": "SEE LICENSE IN LICENSE.md",
  "dependencies": {
-    "express": "^4.17.3",
+    "express": "^4.18.1",
    "hs-client": "^0.0.10",
    "node-cache": "^5.1.2",
    "punycode": "^2.1.1"
--- a/packages/handshake-api/yarn.lock
+++ b/packages/handshake-api/yarn.lock
@ -31,21 +31,23 @@ bcurl@~0.1.9:
    bsert "~0.0.10"
    bsock "~0.1.9"

-body-parser@1.19.2:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
-  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+body-parser@1.20.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
+  integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
  dependencies:
    bytes "3.1.2"
    content-type "~1.0.4"
    debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
    iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.7"
-    raw-body "2.4.3"
+    on-finished "2.4.1"
+    qs "6.10.3"
+    raw-body "2.5.1"
    type-is "~1.6.18"
+    unpipe "1.0.0"

 brq@~0.1.8:
  version "0.1.8"
@ -71,6 +73,14 @@ bytes@3.1.2:
  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==

+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 clone@2.x:
  version "2.1.2"
  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
@ -93,10 +103,10 @@ cookie-signature@1.0.6:
  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=

-cookie@0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
-  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==

 debug@2.6.9:
  version "2.6.9"
@ -105,15 +115,15 @@ debug@2.6.9:
  dependencies:
    ms "2.0.0"

-depd@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==

-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==

 ee-first@1.1.1:
  version "1.1.1"
@ -135,53 +145,54 @@ etag@~1.8.1:
  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=

-express@^4.17.3:
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
-  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+express@^4.18.1:
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
+  integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
  dependencies:
    accepts "~1.3.8"
    array-flatten "1.1.1"
-    body-parser "1.19.2"
+    body-parser "1.20.0"
    content-disposition "0.5.4"
    content-type "~1.0.4"
-    cookie "0.4.2"
+    cookie "0.5.0"
    cookie-signature "1.0.6"
    debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
    fresh "0.5.2"
+    http-errors "2.0.0"
    merge-descriptors "1.0.1"
    methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
    parseurl "~1.3.3"
    path-to-regexp "0.1.7"
    proxy-addr "~2.0.7"
-    qs "6.9.7"
+    qs "6.10.3"
    range-parser "~1.2.1"
    safe-buffer "5.2.1"
-    send "0.17.2"
-    serve-static "1.14.2"
+    send "0.18.0"
+    serve-static "1.15.0"
    setprototypeof "1.2.0"
-    statuses "~1.5.0"
+    statuses "2.0.1"
    type-is "~1.6.18"
    utils-merge "1.0.1"
    vary "~1.1.2"

-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
  dependencies:
    debug "2.6.9"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
    parseurl "~1.3.3"
-    statuses "~1.5.0"
+    statuses "2.0.1"
    unpipe "~1.0.0"

 forwarded@0.2.0:
@ -194,6 +205,32 @@ fresh@0.5.2:
  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=

+function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+
+get-intrinsic@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
+  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.1"
+
+has-symbols@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+has@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
+  dependencies:
+    function-bind "^1.1.1"
+
 hs-client@^0.0.10:
  version "0.0.10"
  resolved "https://registry.yarnpkg.com/hs-client/-/hs-client-0.0.10.tgz#b2801441613fbb255cbeacbc764085a36c42ee5e"
@ -203,15 +240,15 @@ hs-client@^0.0.10:
    bcurl "~0.1.9"
    bsert "~0.0.10"

-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
  dependencies:
-    depd "~1.1.2"
+    depd "2.0.0"
    inherits "2.0.4"
    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
+    statuses "2.0.1"
    toidentifier "1.0.1"

 iconv-lite@0.4.24:
@ -297,10 +334,15 @@ node-cache@^5.1.2:
  dependencies:
    clone "2.x"

-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+object-inspect@^1.9.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
+  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
+
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
  dependencies:
    ee-first "1.1.1"

@ -332,23 +374,25 @@ punycode@^2.1.1:
  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

-qs@6.9.7:
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
-  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+qs@6.10.3:
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+  integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
+  dependencies:
+    side-channel "^1.0.4"

 range-parser@~1.2.1:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==

-raw-body@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
-  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
  dependencies:
    bytes "3.1.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
    iconv-lite "0.4.24"
    unpipe "1.0.0"

@ -362,44 +406,53 @@ safe-buffer@5.2.1:
  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==

-send@0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
-  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
  dependencies:
    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
+    depd "2.0.0"
+    destroy "1.2.0"
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    etag "~1.8.1"
    fresh "0.5.2"
-    http-errors "1.8.1"
+    http-errors "2.0.0"
    mime "1.6.0"
    ms "2.1.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
    range-parser "~1.2.1"
-    statuses "~1.5.0"
+    statuses "2.0.1"

-serve-static@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
-  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
  dependencies:
    encodeurl "~1.0.2"
    escape-html "~1.0.3"
    parseurl "~1.3.3"
-    send "0.17.2"
+    send "0.18.0"

 setprototypeof@1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==

-"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==

 toidentifier@1.0.1:
  version "1.0.1"
--- a/packages/health-check/Dockerfile
+++ b/packages/health-check/Dockerfile
@ -1,6 +1,6 @@
 FROM node:16.14.2-alpine

-RUN apk add --no-cache dnsmasq=2.86-r0
+RUN apk add --no-cache dnsmasq~=2

 WORKDIR /usr/app

--- a/packages/health-check/package.json
+++ b/packages/health-check/package.json
@ -5,7 +5,7 @@
  "license": "MIT",
  "dependencies": {
    "deep-object-diff": "^1.1.7",
-    "express": "^4.17.3",
+    "express": "^4.18.1",
    "form-data": "^4.0.0",
    "got": "^11.8.2",
    "graceful-fs": "^4.2.10",
@ -13,12 +13,12 @@
    "http-status-codes": "^2.2.0",
    "lodash": "^4.17.21",
    "lowdb": "^1.0.0",
-    "skynet-js": "^4.0.19-beta",
+    "skynet-js": "^4.1.0",
    "write-file-atomic": "^4.0.1",
    "yargs": "^17.4.1"
  },
  "devDependencies": {
-    "jest": "^27.5.1",
+    "jest": "^28.0.3",
    "prettier": "^2.6.2"
  }
 }
--- a/packages/health-check/yarn.lock
+++ b/packages/health-check/yarn.lock
--- a/packages/website/Dockerfile
+++ b/packages/website/Dockerfile
@ -1,15 +1,15 @@
-FROM node:16.14.2-alpine
-
-RUN apk add --no-cache autoconf=2.71-r0 automake=1.16.4-r1 build-base=0.5-r2 libtool=2.4.6-r7 nasm=2.15.05-r0 pkgconf=1.8.0-r0
+# builder stage - use debian base image to avoid needing to install missing packages
+FROM node:16.14.2-bullseye as builder

 WORKDIR /usr/app

+# disable gatsby telemetry and installing cypress binary
+ENV GATSBY_TELEMETRY_DISABLED 1
+ENV CYPRESS_INSTALL_BINARY 0
+
 COPY packages/website/package.json \
     packages/website/yarn.lock \
     ./
-
-ENV GATSBY_TELEMETRY_DISABLED 1
-ENV CYPRESS_INSTALL_BINARY 0
 RUN yarn --frozen-lockfile

 COPY packages/website/data ./data
@ -22,6 +22,16 @@ COPY packages/website/gatsby-*.js \

 RUN yarn build

+# main stage - use alpine base image to minimise the resulting image footprint
+FROM node:16.14.2-alpine
+
+WORKDIR /usr/app
+
+# install http server for serving website files
+RUN npm install --global http-server@14.1.0
+
+COPY --from=builder /usr/app/public /usr/app/public
+
 EXPOSE 9000

-CMD ["sh", "-c", "yarn serve --host 0.0.0.0"]
+CMD ["http-server", "/usr/app/public", "-s", "-p 9000"]
--- a/packages/website/package.json
+++ b/packages/website/package.json
@ -5,50 +5,50 @@
  "version": "0.1.0",
  "author": "Skynet Labs.",
  "dependencies": {
-    "@fontsource/sora": "4.5.5",
+    "@fontsource/sora": "4.5.8",
    "@fontsource/source-sans-pro": "4.5.6",
    "@svgr/webpack": "6.2.1",
    "bytes": "3.1.2",
    "classnames": "2.3.1",
    "copy-text-to-clipboard": "3.0.1",
    "crypto-browserify": "3.12.0",
-    "framer-motion": "6.2.10",
-    "gatsby": "4.12.1",
+    "framer-motion": "6.3.3",
+    "gatsby": "4.13.1",
    "gatsby-background-image": "1.6.0",
-    "gatsby-plugin-image": "2.11.1",
-    "gatsby-plugin-manifest": "4.11.1",
-    "gatsby-plugin-postcss": "5.12.1",
-    "gatsby-plugin-react-helmet": "5.10.0",
+    "gatsby-plugin-image": "2.12.1",
+    "gatsby-plugin-manifest": "4.12.1",
+    "gatsby-plugin-postcss": "5.13.0",
+    "gatsby-plugin-react-helmet": "5.13.0",
    "gatsby-plugin-robots-txt": "1.7.1",
-    "gatsby-plugin-sharp": "4.12.1",
-    "gatsby-plugin-sitemap": "5.11.1",
+    "gatsby-plugin-sharp": "4.13.0",
+    "gatsby-plugin-sitemap": "5.13.0",
    "gatsby-plugin-svgr": "3.0.0-beta.0",
-    "gatsby-source-filesystem": "4.10.1",
-    "gatsby-transformer-sharp": "4.10.0",
-    "gatsby-transformer-yaml": "4.11.0",
+    "gatsby-source-filesystem": "4.13.0",
+    "gatsby-transformer-sharp": "4.13.0",
+    "gatsby-transformer-yaml": "4.13.0",
    "gbimage-bridge": "0.2.1",
    "http-status-codes": "2.2.0",
    "ms": "2.1.3",
-    "nanoid": "3.3.2",
+    "nanoid": "3.3.4",
    "normalize.css": "8.0.1",
    "path-browserify": "1.0.1",
-    "polished": "4.2.1",
-    "postcss": "8.4.12",
+    "polished": "4.2.2",
+    "postcss": "8.4.13",
    "prop-types": "15.8.1",
    "react": "17.0.2",
    "react-dom": "17.0.2",
-    "react-dropzone": "12.0.5",
+    "react-dropzone": "14.2.0",
    "react-helmet": "6.1.0",
    "react-use": "17.3.2",
-    "skynet-js": "4.0.26-beta",
+    "skynet-js": "4.1.0",
    "stream-browserify": "3.0.0",
-    "swr": "1.2.2"
+    "swr": "1.3.0"
  },
  "devDependencies": {
    "@tailwindcss/typography": "0.5.2",
-    "autoprefixer": "10.4.4",
+    "autoprefixer": "10.4.7",
    "cross-env": "7.0.3",
-    "cypress": "9.5.2",
+    "cypress": "9.6.0",
    "prettier": "2.6.2",
    "tailwindcss": "3.0.24"
  },
--- a/packages/website/yarn.lock
+++ b/packages/website/yarn.lock
--- a/setup-scripts/README.md
+++ b/setup-scripts/README.md
@ -2,7 +2,7 @@

 > :warning: This documentation is outdated and should be used for reference
 only. Portal setup documentation is located at
-https://docs.siasky.net/webportal-management/overview.
+https://portal-docs.skynetlabs.com/.

 This directory contains a setup guide and scripts that will install and
 configure some basic requirements for running a Skynet Portal. The assumption is