From a9ec7dc4fa1e2d6062d3d1cbebf5d3cb37aa9e32 Mon Sep 17 00:00:00 2001 From: dec0dOS Date: Wed, 22 Jun 2022 19:58:37 +0300 Subject: [PATCH] ci: revert some changes in ci --- docker/zero-ui/Dockerfile | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/docker/zero-ui/Dockerfile b/docker/zero-ui/Dockerfile index 3777e22..eefa91e 100644 --- a/docker/zero-ui/Dockerfile +++ b/docker/zero-ui/Dockerfile @@ -3,16 +3,14 @@ FROM --platform=$BUILDPLATFORM node:lts-alpine as frontend-build ENV INLINE_RUNTIME_CHUNK=false ENV GENERATE_SOURCEMAP=false -WORKDIR /app -COPY package.json /app -COPY .yarnrc.yml /app/.yarnrc.yml -COPY .yarn /app/.yarn - +WORKDIR /app/frontend +COPY yarn.lock .yarnrc.yml ./ +COPY .yarn/ ./.yarn/ COPY ./frontend/package*.json /app/frontend -RUN yarn workspace frontend install +RUN yarn install COPY ./frontend /app/frontend -RUN yarn workspace frontend build +RUN yarn build FROM node:lts-alpine @@ -20,13 +18,11 @@ FROM node:lts-alpine WORKDIR /app/frontend/build COPY --from=frontend-build /app/frontend/build /app/frontend/build/ -WORKDIR /app -COPY package.json /app -COPY .yarnrc.yml /app/.yarnrc.yml -COPY .yarn /app/.yarn - +WORKDIR /app/backend +COPY yarn.lock .yarnrc.yml ./ +COPY .yarn/ ./.yarn/ COPY ./backend/package*.json /app/backend -RUN yarn workspace backend install +RUN yarn install COPY ./backend /app/backend @@ -35,6 +31,4 @@ ENV NODE_ENV=production ENV ZU_SECURE_HEADERS=true ENV ZU_SERVE_FRONTEND=true -WORKDIR /app/backend - CMD [ "node", "./bin/www" ]