Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop

CALCKEY.md

@@ -32,6 +32,7 @@
 ## Implemented
 
 - Yarn 3
+  - Fix Dockerfile @hanna
 - Saner defaults
 - Star as default reaction
 - Recommended Instances timeline

Dockerfile

@@ -1,33 +1,27 @@
-FROM node:16.15.1-bullseye AS builder
+FROM node:alpine
-
+ENV YARN_CHECKSUM_BEHAVIOR=update
 ARG NODE_ENV=production
-
 WORKDIR /misskey
 
+# Copy Files
 COPY . ./
 
-RUN apt-get update
+# Install Dependencies
-RUN apt-get install -y build-essential
+RUN apk update
-RUN git submodule update --init
+RUN apk add git ffmpeg tini alpine-sdk
+
+# Configure corepack and yarn
+RUN corepack enable
 RUN yarn set version berry
+RUN yarn plugin import workspace-tools
+
+# Install Dependencies
+RUN yarn add @bull-board/api @bull-board/ui
 RUN yarn install
 RUN yarn build
+
+# Remove git files
 RUN rm -rf .git
 
-FROM node:16.15.1-bullseye-slim AS runner
+ENTRYPOINT [ "/sbin/tini", "--" ]
-
+CMD [ "yarn", "run", "migrateandstart" ]
-WORKDIR /misskey
-
-RUN apt-get update
-RUN apt-get install -y ffmpeg tini
-
-COPY --from=builder /misskey/node_modules ./node_modules
-COPY --from=builder /misskey/built ./built
-COPY --from=builder /misskey/packages/backend/node_modules ./packages/backend/node_modules
-COPY --from=builder /misskey/packages/backend/built ./packages/backend/built
-COPY --from=builder /misskey/packages/client/node_modules ./packages/client/node_modules
-COPY . ./
-
-ENV NODE_ENV=production
-ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["npm", "run", "migrateandstart"]