From 1472f423891f2829e9a13b9ed25e3f913a32add2 Mon Sep 17 00:00:00 2001 From: Lea Date: Wed, 12 Apr 2023 22:01:30 +0200 Subject: [PATCH] Fix docker builds --- bot/Dockerfile | 13 +++++++++++++ bridge/Dockerfile | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/bot/Dockerfile b/bot/Dockerfile index af34752..e9cfd1a 100644 --- a/bot/Dockerfile +++ b/bot/Dockerfile @@ -1,10 +1,22 @@ FROM node:18 as build WORKDIR /build/app + COPY bot/package.json bot/yarn.lock bot/.yarnrc.yml ./ COPY bot/.yarn ./.yarn COPY lib ../lib +COPY revolt.js ../revolt.js + RUN yarn --cwd ../lib --immutable RUN yarn --cwd ../lib build + +# pnpm's --dir doesn't work, so cool! +WORKDIR /build/revolt.js +RUN corepack enable +RUN corepack prepare pnpm@7.14.2 --activate +RUN pnpm install +RUN pnpm run build + +WORKDIR /build/app RUN yarn install --immutable COPY ./bot . RUN yarn build @@ -15,5 +27,6 @@ COPY --from=build /build/app/package.json /build/app/yarn.lock /build/app/.yarnr COPY --from=build /build/app/.yarn ./.yarn COPY --from=build /build/app/dist ./dist COPY --from=build /build/lib ../lib +COPY --from=build /build/revolt.js ../revolt.js RUN yarn install --immutable CMD ["yarn", "start"] diff --git a/bridge/Dockerfile b/bridge/Dockerfile index a6c70fa..f4b89e1 100644 --- a/bridge/Dockerfile +++ b/bridge/Dockerfile @@ -1,10 +1,21 @@ FROM node:18 as build WORKDIR /build/app + COPY bridge/package.json bridge/yarn.lock bridge/.yarnrc.yml ./ COPY bridge/.yarn ./.yarn COPY lib ../lib +COPY revolt.js ../revolt.js + RUN yarn --cwd ../lib --immutable RUN yarn --cwd ../lib build + +WORKDIR /build/revolt.js +RUN corepack enable +RUN corepack prepare pnpm@7.14.2 --activate +RUN pnpm install +RUN pnpm run build + +WORKDIR /build/app RUN yarn install --immutable COPY ./bridge . RUN yarn build @@ -15,5 +26,6 @@ COPY --from=build /build/app/package.json /build/app/yarn.lock /build/app/.yarnr COPY --from=build /build/app/.yarn ./.yarn COPY --from=build /build/app/dist ./dist COPY --from=build /build/lib ../lib +COPY --from=build /build/revolt.js ../revolt.js RUN yarn install --immutable CMD ["yarn", "start"]