From 7c5d0d0ec671d84deba14003adfced839bb6b9cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Szil=C3=A1rd=20D=C3=B3r=C3=B3?= <doroszilard@gmail.com>
Date: Tue, 15 Nov 2022 18:02:59 +0100
Subject: [PATCH] fix(dashboard): copy public folder

---
 .dockerignore        |  3 +--
 dashboard/Dockerfile | 21 +++++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 7393c2bb6..c13d280d6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,5 +6,4 @@
 **/.turbo
 **/.nhost
 **/coverage
-**/.next
-**/.git
\ No newline at end of file
+**/.next
\ No newline at end of file
diff --git a/dashboard/Dockerfile b/dashboard/Dockerfile
index 44be7ed15..323ff233d 100644
--- a/dashboard/Dockerfile
+++ b/dashboard/Dockerfile
@@ -5,7 +5,7 @@ RUN apk update
 WORKDIR /app
 
 RUN yarn global add turbo
-COPY ./ ./
+COPY . .
 RUN turbo prune --scope="@nhost/dashboard" --docker
 
 FROM node:16-alpine AS builder
@@ -19,11 +19,11 @@ ENV NEXT_PUBLIC_NHOST_BACKEND_URL http://localhost:1337
 
 RUN yarn global add pnpm
 COPY .gitignore .gitignore
-COPY --from=pruner /app/out/json/ ./
-COPY --from=pruner /app/out/pnpm-*.yaml ./
+COPY --from=pruner /app/out/json/ .
+COPY --from=pruner /app/out/pnpm-*.yaml .
 RUN pnpm install --frozen-lockfile
 
-COPY --from=pruner /app/out/full/ ./
+COPY --from=pruner /app/out/full/ .
 COPY turbo.json turbo.json
 COPY config/ config/
 RUN pnpm build:dashboard
@@ -35,16 +35,13 @@ RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 USER nextjs
 
-COPY --from=builder /app/dashboard/next.config.js ./
-COPY --from=builder /app/dashboard/package.json ./
+COPY --from=builder /app/dashboard/next.config.js .
+COPY --from=builder /app/dashboard/package.json .
+COPY --from=builder /app/dashboard/public ./dashboard/public
 
 # Automatically leverage output traces to reduce image size
 # https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --chown=nextjs:nodejs /app/dashboard/public /app/dashboard/.next/standalone/public
-COPY --from=builder --chown=nextjs:nodejs /app/dashboard/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/dashboard/.next/standalone/app ./
 COPY --from=builder --chown=nextjs:nodejs /app/dashboard/.next/static ./dashboard/.next/static
 
-ENV PORT 3000
-EXPOSE 3000
-
-CMD node app/dashboard/server.js
\ No newline at end of file
+CMD node dashboard/server.js
\ No newline at end of file