From 86f8198b3c02a014732343a57c1b752d723b26cd Mon Sep 17 00:00:00 2001 From: Juunini Date: Fri, 16 Feb 2024 21:01:31 +0900 Subject: [PATCH] add misskey-js, reversi, bubble-game in yodangang dockerfile --- YodangangExpress.Dockerfile | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/YodangangExpress.Dockerfile b/YodangangExpress.Dockerfile index f504bf2bf076..abd16be87448 100644 --- a/YodangangExpress.Dockerfile +++ b/YodangangExpress.Dockerfile @@ -1,4 +1,4 @@ -FROM juunini/misskey:builder-0.3 AS builder +FROM juunini/misskey:builder-0.5 AS builder COPY . /misskey WORKDIR /misskey @@ -7,20 +7,20 @@ USER root ENV NODE_ENV=production ENV VITE_CLOUD_STORAGE_ORIGIN=https://storage.googleapis.com/yodangang-express/ -RUN git submodule update --init -RUN corepack enable -RUN pnpm install -RUN pnpm build +RUN git submodule update --init &&\ + corepack enable &&\ + pnpm install &&\ + pnpm build -FROM juunini/misskey:builder-0.3 - -RUN apt install -y tini +FROM juunini/misskey:builder-0.5 WORKDIR /misskey -RUN mkdir -p /misskey/packages/backend -RUN mkdir -p /misskey/packages/frontend -RUN mkdir -p /misskey/.config +RUN mkdir -p /misskey/packages/backend &&\ + mkdir -p /misskey/packages/frontend &&\ + mkdir -p /misskey/packages/misskey-js &&\ + mkdir -p /misskey/packages/misskey-reversi &&\ + mkdir -p /misskey/.config COPY --from=builder /misskey/built /misskey/built COPY --from=builder /misskey/package.json /misskey/package.json @@ -34,8 +34,18 @@ COPY --from=builder /misskey/packages/backend/node_modules /misskey/packages/bac COPY --from=builder /misskey/packages/backend/built /misskey/packages/backend/built COPY --from=builder /misskey/packages/backend/assets /misskey/packages/backend/assets COPY --from=builder /misskey/packages/frontend/assets /misskey/packages/frontend/assets +COPY --from=builder /misskey/packages/misskey-js/package.json /misskey/packages/misskey-js/package.json +COPY --from=builder /misskey/packages/misskey-js/built /misskey/packages/misskey-js/built +COPY --from=builder /misskey/packages/misskey-js/node_modules /misskey/packages/misskey-js/node_modules +COPY --from=builder /misskey/packages/misskey-reversi/package.json /misskey/packages/misskey-reversi/package.json +COPY --from=builder /misskey/packages/misskey-reversi/built /misskey/packages/misskey-reversi/built +COPY --from=builder /misskey/packages/misskey-reversi/node_modules /misskey/packages/misskey-reversi/node_modules +COPY --from=builder /misskey/packages/misskey-bubble-game/package.json /misskey/packages/misskey-bubble-game/package.json +COPY --from=builder /misskey/packages/misskey-bubble-game/built /misskey/packages/misskey-bubble-game/built +COPY --from=builder /misskey/packages/misskey-bubble-game/node_modules /misskey/packages/misskey-bubble-game/node_modules COPY --from=builder /misskey/fluent-emojis /misskey/fluent-emojis +ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so ENV NODE_ENV=production HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/misskey/healthcheck.sh"]