diff --git a/docker-compose.development.yml b/docker-compose.development.yml index 467f95f8d..5035e31b9 100644 --- a/docker-compose.development.yml +++ b/docker-compose.development.yml @@ -123,7 +123,6 @@ services: APP_VERSION: ${GIT_BRANCH} VITE_API_URL: https://${FMTM_API_DOMAIN:-api.${FMTM_DOMAIN}} VITE_SYNC_URL: https://${FMTM_SYNC_DOMAIN:-sync.${FMTM_DOMAIN}} - NODE_ENV: development volumes: - fmtm_frontend:/frontend network_mode: none diff --git a/docker-compose.main.yml b/docker-compose.main.yml index da8683b78..475f9f88b 100644 --- a/docker-compose.main.yml +++ b/docker-compose.main.yml @@ -113,7 +113,6 @@ services: APP_VERSION: main VITE_API_URL: https://${FMTM_API_DOMAIN:-api.${FMTM_DOMAIN}} VITE_SYNC_URL: https://${FMTM_SYNC_DOMAIN:-sync.${FMTM_DOMAIN}} - NODE_ENV: production volumes: - fmtm_frontend:/frontend network_mode: none diff --git a/src/Dockerfile.ui.debug b/src/Dockerfile.ui.debug index 951036499..c01d3698a 100755 --- a/src/Dockerfile.ui.debug +++ b/src/Dockerfile.ui.debug @@ -11,5 +11,4 @@ ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" RUN corepack enable && corepack use pnpm@9.3.0 RUN pnpm install -ENV NODE_ENV development ENTRYPOINT ["pnpm", "run", "dev"] diff --git a/src/Dockerfile.ui.prod b/src/Dockerfile.ui.prod index 70bf2db8b..9eed9fbd0 100644 --- a/src/Dockerfile.ui.prod +++ b/src/Dockerfile.ui.prod @@ -1,10 +1,8 @@ -FROM docker.io/node:20 AS base -ARG NODE_ENV +FROM docker.io/node:20-slim AS base ARG VITE_API_URL ARG VITE_SYNC_URL ENV VITE_API_URL=${VITE_API_URL} \ VITE_SYNC_URL=${VITE_SYNC_URL} \ - NODE_ENV=${NODE_ENV} \ PNPM_HOME="/pnpm" \ PATH="$PATH:/pnpm" RUN corepack enable && corepack use pnpm@9.3.0 @@ -15,14 +13,14 @@ FROM base AS manager-frontend COPY frontend/package.json frontend/pnpm-lock.yaml ./ RUN pnpm install COPY frontend/ . -RUN pnpm run build --mode ${NODE_ENV} +RUN pnpm run build FROM base AS mapper-frontend COPY mapper/package.json mapper/pnpm-lock.yaml ./ RUN pnpm install COPY mapper/ . -RUN pnpm run build --mode ${NODE_ENV} +RUN pnpm run build FROM docker.io/rclone/rclone:1 AS prod