From cb56ba536e5c857e24cb834d6217cc64e77319d4 Mon Sep 17 00:00:00 2001 From: Benjamin Bours Date: Sat, 14 Oct 2023 14:20:07 +0100 Subject: [PATCH] Keep solving build issues --- .github/workflows/front_cd_staging.yml | 3 +++ back/Dockerfile.back.dockerignore | 1 + front/Dockerfile.front | 8 +++++++- front/Dockerfile.front.dockerignore | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/front_cd_staging.yml b/.github/workflows/front_cd_staging.yml index ef62a272..58cf380b 100644 --- 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 index 3b1a695b..97ed5ad5 100644 --- 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 index c8232d79..db192fb6 100644 --- 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 index 8cc9b39f..41ddeca0 100644 --- a/front/Dockerfile.front.dockerignore +++ b/front/Dockerfile.front.dockerignore @@ -1,4 +1,5 @@ * +!.npmrc !front front/node_modules