Merge branch 'master' into improve-lua-stability-and-test-coverage

.github/workflows/lint-dockerfiles.yml

@@ -16,6 +16,7 @@ jobs:
           - docker/nginx/Dockerfile
           - docker/sia/Dockerfile
           - packages/dashboard/Dockerfile
+          - packages/dashboard-v2/Dockerfile
           - packages/dnslink-api/Dockerfile
           - packages/handshake-api/Dockerfile
           - packages/health-check/Dockerfile

docker-compose.accounts.yml

@@ -75,3 +75,25 @@ services:
       - 3000
     depends_on:
       - mongo
+
+  dashboard-v2:
+    build:
+      context: ./packages/dashboard-v2
+      dockerfile: Dockerfile
+    container_name: dashboard-v2
+    restart: unless-stopped
+    logging: *default-logging
+    env_file:
+      - .env
+    environment:
+      - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN}
+    volumes:
+      - ./docker/data/dashboard-v2/.cache:/usr/app/.cache
+      - ./docker/data/dashboard-v2/public:/usr/app/public
+    networks:
+      shared:
+        ipv4_address: 10.10.10.86
+    expose:
+      - 9000
+    depends_on:
+      - mongo

docker-compose.yml

@@ -82,9 +82,11 @@ services:
       - website
 
   website:
-    build:
-      context: ./packages/website
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/website/Dockerfile
+    image: skynetlabs/website
     container_name: website
     restart: unless-stopped
     logging: *default-logging
@@ -118,9 +120,11 @@ services:
       - 12037
 
   handshake-api:
-    build:
-      context: ./packages/handshake-api
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/handshake-api/Dockerfile
+    image: skynetlabs/handshake-api
     container_name: handshake-api
     restart: unless-stopped
     logging: *default-logging
@@ -140,9 +144,11 @@ services:
       - handshake
 
   dnslink-api:
-    build:
-      context: ./packages/dnslink-api
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/dnslink-api/Dockerfile
+    image: skynetlabs/dnslink-api
     container_name: dnslink-api
     restart: unless-stopped
     logging: *default-logging
@@ -153,9 +159,11 @@ services:
       - 3100
 
   health-check:
-    build:
-      context: ./packages/health-check
-      dockerfile: Dockerfile
+    # uncomment "build" and comment out "image" to build from sources
+    # build:
+    #   context: https://github.com/SkynetLabs/skynet-webportal.git#master
+    #   dockerfile: ./packages/health-check/Dockerfile
+    image: skynetlabs/health-check
     container_name: health-check
     restart: unless-stopped
     logging: *default-logging

docker/nginx/conf.d/server/server.api

@@ -254,8 +254,8 @@ location /skynet/tus {
     limit_conn upload_conn 5;
     limit_conn upload_conn_rl 1;
 
-    # TUS chunks size is 40M + leaving 10M of breathing room
-    client_max_body_size 50M;
+    # Do not limit body size in nginx, skyd will reject early on too large upload
+    client_max_body_size 0;
 
     # Those timeouts need to be elevated since skyd can stall reading
     # data for a while when overloaded which would terminate connection

packages/dashboard-v2/Dockerfile

@@ -0,0 +1,14 @@
+FROM node:16.14.2-alpine
+
+WORKDIR /usr/app
+
+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 ./
+
+CMD ["sh", "-c", "yarn build && yarn serve --host 0.0.0.0 -p 9000"]

packages/dashboard-v2/gatsby-config.js

@@ -18,7 +18,7 @@ module.exports = {
       resolve: "gatsby-source-filesystem",
       options: {
         name: "images",
-        path: "./src/images/",
+        path: "./static/images/",
       },
       __key: "images",
     },

packages/dashboard-v2/src/hooks/useUpgradeRedirect.js

@@ -17,7 +17,6 @@ export default function useUpgradeRedirect() {
 
     if (isDataLoaded) {
       if (settings.isSubscriptionRequired && !hasPaidSubscription) {
-        console.log("redirecting", user, settings);
         navigate("/upgrade");
       } else {
         setVerifyingSubscription(false);

packages/dashboard-v2/src/layouts/DashboardLayout.js

@@ -5,7 +5,7 @@ import { SWRConfig } from "swr";
 import { authenticatedOnly } from "../lib/swrConfig";
 
 import { PageContainer } from "../components/PageContainer";
-import { NavBar } from "../components/Navbar";
+import { NavBar } from "../components/NavBar";
 import { Footer } from "../components/Footer";
 import { UserProvider, useUser } from "../contexts/user";
 import { FullScreenLoadingIndicator } from "../components/LoadingIndicator";

packages/dashboard-v2/src/layouts/UserSettingsLayout.js

@@ -6,7 +6,7 @@ import { SWRConfig } from "swr";
 import { authenticatedOnly } from "../lib/swrConfig";
 
 import { PageContainer } from "../components/PageContainer";
-import { NavBar } from "../components/Navbar";
+import { NavBar } from "../components/NavBar";
 import { Footer } from "../components/Footer";
 import { UserProvider, useUser } from "../contexts/user";
 import { ContainerLoadingIndicator } from "../components/LoadingIndicator";

packages/dashboard-v2/src/pages/auth/signup.js

@@ -15,7 +15,7 @@ const FreePortalHeader = () => {
   const { plans } = usePlans();
 
   const freePlan = plans.find(({ price }) => price === 0);
-  const freeStorage = freePlan ? bytes(freePlan.limits?.storageLimit, { binary: true }) : null;
+  const freeStorage = freePlan?.limits ? bytes(freePlan.limits?.storageLimit, { binary: true }) : null;
 
   return (
     <div className="mt-4 mb-8 font-sans">

packages/dashboard-v2/yarn.lock

@@ -14090,7 +14090,7 @@ sjcl@^1.0.8:
   resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a"
   integrity sha512-LzIjEQ0S0DpIgnxMEayM1rq9aGwGRG4OnZhCdjx7glTaJtf4zRfpg87ImfjSJjoW9vKpagd82McDOwbRT5kQKQ==
 
-skynet-js@^4.0.27-beta:
+skynet-js@4.0.27-beta:
   version "4.0.27-beta"
   resolved "https://registry.yarnpkg.com/skynet-js/-/skynet-js-4.0.27-beta.tgz#4257bffda8757830656e0beb89d0d2e44da17e2f"
   integrity sha512-JV+QE/2l2YwVN1jQHVMFXgggwtBrPAnuyXySbLgafEJAde5dUwSEr5YRMV+3LvEgYkGhxSb74pyq0u0wrF2sUg==

packages/dnslink-api/Dockerfile

@@ -2,11 +2,13 @@ FROM node:16.14.2-alpine
 
 WORKDIR /usr/app
 
-COPY package.json yarn.lock ./
+COPY packages/dnslink-api/package.json \
+     packages/dnslink-api/yarn.lock \
+     ./
 
 RUN yarn --frozen-lockfile
 
-COPY src/* src/
+COPY packages/dnslink-api/src/* src/
 
 EXPOSE 3100
 CMD ["node", "src/index.js"]

packages/handshake-api/Dockerfile

@@ -2,11 +2,13 @@ FROM node:16.14.2-alpine
 
 WORKDIR /usr/app
 
-COPY package.json yarn.lock ./
+COPY packages/handshake-api/package.json \
+     packages/handshake-api/yarn.lock \
+     ./
 
 RUN yarn --frozen-lockfile
 
-COPY src/* src/
+COPY packages/handshake-api/src/* src/
 
 ENV HSD_NETWORK="main"
 ENV HSD_HOST="0.0.0.0"

packages/health-check/Dockerfile

@@ -11,13 +11,15 @@ ENV PATH="/usr/app/bin:${PATH}"
 RUN echo '*/5 * * * * source /etc/environment ; /usr/app/bin/cli run critical >> /proc/1/fd/1' >> /etc/crontabs/root && \
     echo '0 * * * * source /etc/environment ; /usr/app/bin/cli run extended >> /proc/1/fd/1' >> /etc/crontabs/root
 
-COPY package.json yarn.lock ./
+COPY packages/health-check/package.json \
+     packages/health-check/yarn.lock \
+     ./
 
 RUN yarn --frozen-lockfile
 
-COPY src src
-COPY cli cli
-COPY bin bin
+COPY packages/health-check/src src
+COPY packages/health-check/cli cli
+COPY packages/health-check/bin bin
 
 EXPOSE 3100
 ENV NODE_ENV production

packages/website/Dockerfile

@@ -4,16 +4,21 @@ RUN apk add --no-cache autoconf=2.71-r0 automake=1.16.4-r1 build-base=0.5-r2 lib
 
 WORKDIR /usr/app
 
-COPY package.json yarn.lock ./
+COPY packages/website/package.json \
+     packages/website/yarn.lock \
+     ./
 
 ENV GATSBY_TELEMETRY_DISABLED 1
 ENV CYPRESS_INSTALL_BINARY 0
 RUN yarn --frozen-lockfile
 
-COPY data ./data
-COPY src ./src
-COPY static ./static
-COPY gatsby-browser.js gatsby-config.js gatsby-node.js gatsby-ssr.js postcss.config.js tailwind.config.js ./
+COPY packages/website/data ./data
+COPY packages/website/src ./src
+COPY packages/website/static ./static
+COPY packages/website/gatsby-*.js \
+     packages/website/postcss.config.js \
+     packages/website/tailwind.config.js \
+     ./
 
 RUN yarn build