From 3392e04d38c2c86af52622bb24a4930d6d3e6c18 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Wed, 22 Jun 2022 10:23:54 +0200
Subject: [PATCH] =?UTF-8?q?ci:=20=F0=9F=91=B7=20Simplify=20build=20on=20Ve?=
 =?UTF-8?q?rcel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                | 2 +-
 apps/builder/package.json | 3 +--
 apps/viewer/package.json  | 3 +--
 package.json              | 2 ++
 turbo.json                | 4 ----
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 996db1858..91a152d7f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,7 @@ COPY --from=pruner /app/out/full/ .
 COPY ./apps/${SCOPE}/.env.docker ./apps/${SCOPE}/.env.production
 COPY ./apps/${SCOPE}/.env.docker ./apps/${SCOPE}/.env.local
 RUN apt-get -qy update && apt-get -qy install openssl
-RUN yarn turbo run build:docker --scope=${SCOPE} --include-dependencies --no-deps
+RUN yarn turbo run build --scope=${SCOPE} --include-dependencies --no-deps
 RUN find . -name node_modules | xargs rm -rf
 
 FROM base AS runner
diff --git a/apps/builder/package.json b/apps/builder/package.json
index 0483d9d7e..00bf6b1f4 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -5,8 +5,7 @@
   "scripts": {
     "dx": "yarn dev",
     "dev": "ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3000",
-    "build": "cp .env.docker .env.production && ENVSH_ENV=.env.production bash ../../env.sh next build",
-    "build:docker": "next build",
+    "build": "next build",
     "start": "next start",
     "lint": "next lint",
     "test": "yarn playwright test",
diff --git a/apps/viewer/package.json b/apps/viewer/package.json
index 8a8d37d29..cfbbeb289 100644
--- a/apps/viewer/package.json
+++ b/apps/viewer/package.json
@@ -5,8 +5,7 @@
   "scripts": {
     "dx": "yarn dev",
     "dev": "ENVSH_ENV=.env.local bash ../../env.sh next dev -p 3001",
-    "build": "cp .env.docker .env.production && ENVSH_ENV=.env.production bash ../../env.sh next build",
-    "build:docker": "next build",
+    "build": "next build",
     "start": "next start",
     "lint": "next lint",
     "test": "yarn playwright test",
diff --git a/package.json b/package.json
index 82523da63..ff289f732 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,8 @@
     "dev": "yarn docker:up && yarn dev:prepare && NEXT_PUBLIC_E2E_TEST=false turbo run dx --parallel",
     "dev:mocking": "yarn docker:up && NEXT_PUBLIC_E2E_TEST=enabled turbo run dx --parallel",
     "build": "yarn docker:up && turbo run build",
+    "build:builder": "cp apps/builder/.env.docker apps/builder/.env.production && ENVSH_ENV=./apps/builder/.env.production ENVSH_OUTPUT=./apps/builder/public/__env.js bash env.sh yarn turbo run build --scope=builder --include-dependencies",
+    "build:viewer": "cp apps/viewer/.env.docker apps/viewer/.env.production && ENVSH_ENV=./apps/viewer/.env.production ENVSH_OUTPUT=./apps/viewer/public/__env.js bash env.sh yarn turbo run build --scope=viewer --include-dependencies",
     "test:builder": "cd apps/builder && yarn test",
     "lint": "turbo run lint",
     "db:migrate": "yarn workspace db migration:deploy"
diff --git a/turbo.json b/turbo.json
index ebca1ad80..681b7d053 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,10 +1,6 @@
 {
   "baseBranch": "origin/main",
   "pipeline": {
-    "build:docker": {
-      "dependsOn": ["^build"],
-      "outputs": [".next/**", "dist/**", "build/**", "node_modules/@prisma/**"]
-    },
     "build": {
       "dependsOn": ["^build"],
       "outputs": [".next/**", "dist/**", "build/**", "node_modules/@prisma/**"]