From 3c34d3f271647639c6460a44c3c875885e9ec690 Mon Sep 17 00:00:00 2001 From: Simon KP <“simon@techops.services”> Date: Wed, 15 May 2024 13:17:29 +1000 Subject: [PATCH] build-arg --- .github/workflows/angular-dev.yml | 1 + .github/workflows/angular-new-prod.yml | 1 + frontend/Dockerfile | 6 ++---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/angular-dev.yml b/.github/workflows/angular-dev.yml index 4c11bb81..720e5d6a 100644 --- a/.github/workflows/angular-dev.yml +++ b/.github/workflows/angular-dev.yml @@ -55,6 +55,7 @@ jobs: -t $ECR_REGISTRY/$AWS_ECR_NAME:$SHA_TAG \ -t $ECR_REGISTRY/$AWS_ECR_NAME:$LATEST_TAG \ -t $ECR_REGISTRY/$AWS_ECR_NAME:$ENVIRONMENT_TAG \ + --build-arg ENV=dev \ -f Dockerfile \ . diff --git a/.github/workflows/angular-new-prod.yml b/.github/workflows/angular-new-prod.yml index 40ffa2d1..f8df5523 100644 --- a/.github/workflows/angular-new-prod.yml +++ b/.github/workflows/angular-new-prod.yml @@ -55,6 +55,7 @@ jobs: -t $ECR_REGISTRY/$AWS_ECR_NAME:$SHA_TAG \ -t $ECR_REGISTRY/$AWS_ECR_NAME:$LATEST_TAG \ -t $ECR_REGISTRY/$AWS_ECR_NAME:$ENVIRONMENT_TAG \ + --build-arg ENV=prod \ -f Dockerfile \ . diff --git a/frontend/Dockerfile b/frontend/Dockerfile index e8a0b419..285bda31 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -6,10 +6,8 @@ COPY . . RUN npm install -# prod -RUN npm run build-prod -# dev -# RUN npm run build +ARG ENV=dev +RUN if [ "$ENV" = "prod" ]; then npm run build-prod; else npm run build; fi FROM nginx:alpine