From 115a993cd2089c924ed8a885b9c20573d1b4103e Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Fri, 12 Jan 2024 16:33:58 +0100 Subject: [PATCH] feat: Convert cloud dockerfile to work without build step --- docker/Dockerfile.cloud | 19 ++++++++++++------- docker/entrypoint-cloud.sh | 6 ++++-- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile.cloud b/docker/Dockerfile.cloud index ffc4b7d8..5dea1986 100644 --- a/docker/Dockerfile.cloud +++ b/docker/Dockerfile.cloud @@ -1,17 +1,22 @@ # syntax=docker/dockerfile:1 FROM node:18-alpine -WORKDIR /automatisch ENV PORT 3000 -RUN ls -lna +RUN \ + apk --no-cache add --virtual build-dependencies python3 build-base git -# copy the app, note .dockerignore -COPY . ./ +RUN git clone -b models-js https://github.com/automatisch/automatisch.git -RUN yarn -RUN yarn lerna bootstrap -RUN yarn lerna run --scope=@*/{web,backend,cli} build +WORKDIR /automatisch + +RUN yarn install + +RUN cd packages/web && yarn build + +RUN \ + rm -rf /usr/local/share/.cache/ && \ + apk del build-dependencies COPY ./docker/entrypoint-cloud.sh /entrypoint-cloud.sh diff --git a/docker/entrypoint-cloud.sh b/docker/entrypoint-cloud.sh index 04b6d61d..bcd09959 100755 --- a/docker/entrypoint-cloud.sh +++ b/docker/entrypoint-cloud.sh @@ -2,8 +2,10 @@ set -e +cd packages/backend + if [ -n "$WORKER" ]; then - yarn automatisch start-worker + yarn start:worker else - yarn automatisch start + yarn start fi