diff --git a/.github/workflows/web-deploy-nonprod.yml b/.github/workflows/web-deploy-nonprod.yml index e2fe9e0..ab168ef 100644 --- a/.github/workflows/web-deploy-nonprod.yml +++ b/.github/workflows/web-deploy-nonprod.yml @@ -71,7 +71,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Docker Build Backend - run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg TEST=${{ secrets.TEST }} + run: docker build -f web/Dockerfile -t john4064/shiftsync:latest_web ./web --build-arg ENVIRONMENT=dev - name: Docker Push Backend run: docker push john4064/shiftsync:latest_web deploy: diff --git a/.github/workflows/web-deploy-prod.yml b/.github/workflows/web-deploy-prod.yml index ae51347..f1d000d 100644 --- a/.github/workflows/web-deploy-prod.yml +++ b/.github/workflows/web-deploy-prod.yml @@ -71,7 +71,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USER }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Docker Build Backend - run: docker build -f web/Dockerfile -t john4064/shiftsync:prod_web ./web --build-arg TEST=${{ secrets.TEST }} + run: docker build -f web/Dockerfile -t john4064/shiftsync:prod_web ./web --build-arg ENVIRONMENT=prod - name: Docker Push Backend run: docker push john4064/shiftsync:prod_web deploy: diff --git a/web/Dockerfile b/web/Dockerfile index 79e60c4..cdef790 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -11,5 +11,7 @@ COPY . ./ EXPOSE 5173 EXPOSE 5171 +ARG ENVIRONMENT=PROD -CMD ["npm", "run", "dev"] + +CMD ["npm", "run", ENVIRONMENT] diff --git a/web/Dockerfile.prod b/web/Dockerfile.prod deleted file mode 100644 index b1c64d4..0000000 --- a/web/Dockerfile.prod +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:20-alpine - -WORKDIR /app - -COPY ./package*.json ./ - -RUN npm ci - -COPY . ./ - -EXPOSE 5173 -EXPOSE 5171 - - -CMD ["npm", "run", "prod"]