Keep solving build issues

benjaminbours · Oct 14, 2023 · cb56ba5 · cb56ba5
1 parent 3af185f
commit cb56ba5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/front_cd_staging.yml b/.github/workflows/front_cd_staging.yml
@@ -33,3 +33,6 @@ jobs:
         tags: ${{ secrets.DOCKERHUB_USERNAME }}/composite-front:latest
         build-args: |
           NPM_TOKEN=${{ secrets.NPM_TOKEN }}
+          NEXT_PUBLIC_STAGE=staging
+          NEXT_PUBLIC_BACKEND_URL=http://composite-api.ddns.net
+          NEXT_PUBLIC_URL=http://composite.ddns.net
diff --git a/back/Dockerfile.back.dockerignore b/back/Dockerfile.back.dockerignore
@@ -1,4 +1,5 @@
 *
+!.npmrc
 
 !back
 back/node_modules

diff --git a/front/Dockerfile.front b/front/Dockerfile.front
@@ -26,7 +26,13 @@ FROM dev as build-staging
 
 WORKDIR /app
 ENV NODE_ENV production
-RUN npm run build:staging -w front
+ARG NEXT_PUBLIC_STAGE
+ENV NEXT_PUBLIC_STAGE ${NEXT_PUBLIC_STAGE}
+ARG NEXT_PUBLIC_BACKEND
+ENV NEXT_PUBLIC_BACKEND ${NEXT_PUBLIC_BACKEND}
+ARG NEXT_PUBLIC_URL
+ENV NEXT_PUBLIC_URL ${NEXT_PUBLIC_URL}
+RUN npm run build -w front
 
 FROM node:18-alpine AS base
 WORKDIR /app

diff --git a/front/Dockerfile.front.dockerignore b/front/Dockerfile.front.dockerignore
@@ -1,4 +1,5 @@
 *
+!.npmrc
 
 !front
 front/node_modules
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
     *
+    !.npmrc
     !back
     back/node_modules
@@ Expand Down @@