From de7e7879b7b9be86084013bb0f4ac3c4d6958505 Mon Sep 17 00:00:00 2001
From: Karol Wypchlo <kwypchlo@gmail.com>
Date: Thu, 21 Apr 2022 10:48:53 +0200
Subject: [PATCH] use dashboard dockerhub image

---
 docker-compose.accounts.yml      | 12 ++++++------
 packages/dashboard-v2/Dockerfile | 14 +++++++++-----
 packages/dashboard/Dockerfile    | 15 ++++++++++-----
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml
index 3c2c46a9..47668b60 100644
--- 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
@@ -77,9 +79,7 @@ services:
       - mongo
 
   dashboard-v2:
-    build:
-      context: ./packages/dashboard-v2
-      dockerfile: Dockerfile
+    build: packages/dashboard-v2/Dockerfile
     container_name: dashboard-v2
     restart: unless-stopped
     logging: *default-logging
diff --git a/packages/dashboard-v2/Dockerfile b/packages/dashboard-v2/Dockerfile
index 70790cfa..4c834e0c 100644
--- 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 packages/dashboard-v2/package.json \
+     packages/dashboard-v2/yarn.lock \
+     ./
 
 RUN yarn --frozen-lockfile
 
-COPY static ./static
-COPY src ./src
-COPY gatsby*.js ./
-COPY postcss.config.js tailwind.config.js ./
+COPY packages/dashboard-v2/static ./static
+COPY packages/dashboard-v2/src ./src
+COPY packages/dashboard-v2/gatsby*.js \
+     packages/dashboard-v2/postcss.config.js \
+     packages/dashboard-v2/tailwind.config.js \
+     ./
 
 CMD ["sh", "-c", "yarn build && yarn serve --host 0.0.0.0 -p 9000"]
diff --git a/packages/dashboard/Dockerfile b/packages/dashboard/Dockerfile
index 39707664..25f584b3 100644
--- 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"]