From 40a9263083ca7d11096ec4851ea61e97c7da79ae Mon Sep 17 00:00:00 2001 From: mia <74628488+squili@users.noreply.github.com> Date: Thu, 7 Dec 2023 16:34:37 -0800 Subject: [PATCH 1/2] switch to more optimized containerfile --- Containerfile | 57 ++++++++++++++++++++++++ Dockerfile | 101 ------------------------------------------ scripts/trim-deps.mjs | 35 +++++++++++++++ 3 files changed, 92 insertions(+), 101 deletions(-) create mode 100644 Containerfile delete mode 100644 Dockerfile create mode 100644 scripts/trim-deps.mjs diff --git a/Containerfile b/Containerfile new file mode 100644 index 000000000..6696b5092 --- /dev/null +++ b/Containerfile @@ -0,0 +1,57 @@ +# syntax = docker/dockerfile:1.4 + +ARG NODE_VERSION=21.4.0-alpine3.18 + +FROM node:${NODE_VERSION} as build + +RUN corepack enable + +WORKDIR /outpatient + +RUN apk add git + +COPY . ./ + +RUN git submodule update +RUN pnpm config set fetch-retries 5 +RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ + pnpm i +RUN pnpm build +RUN node scripts/trim-deps.mjs +RUN mv packages/frontend/assets sharkey-assets +RUN rm -r node_modules packages/frontend packages/sw +RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ + pnpm i --prod +RUN rm -rf .git + +FROM node:${NODE_VERSION} + +WORKDIR /outpatient + +RUN apk add ffmpeg tini + +COPY --from=build /outpatient/built ./built +COPY --from=build /outpatient/node_modules ./node_modules +COPY --from=build /outpatient/packages/backend/built ./packages/backend/built +COPY --from=build /outpatient/packages/backend/node_modules ./packages/backend/node_modules +COPY --from=build /outpatient/packages/megalodon/lib ./packages/megalodon/lib +COPY --from=build /outpatient/packages/megalodon/node_modules ./packages/megalodon/node_modules +COPY --from=build /outpatient/packages/misskey-js/built ./packages/misskey-js/built +COPY --from=build /outpatient/packages/misskey-js/node_modules ./packages/misskey-js/node_modules +COPY --from=build /outpatient/fluent-emojis ./fluent-emojis +COPY --from=build /outpatient/sharkey-assets ./packages/frontend/assets + +COPY package.json ./package.json +COPY pnpm-workspace.yaml ./pnpm-workspace.yaml +COPY packages/backend/package.json ./packages/backend/package.json +COPY packages/backend/check_connect.js ./packages/backend/check_connect.js +COPY packages/backend/ormconfig.js ./packages/backend/ormconfig.js +COPY packages/backend/migration ./packages/backend/migration +COPY packages/backend/assets ./packages/backend/assets +COPY packages/megalodon/package.json ./packages/megalodon/package.json +COPY packages/misskey-js/package.json ./packages/misskey-js/package.json + +ENV NODE_ENV=production +RUN corepack enable +ENTRYPOINT ["/usr/bin/tini", "--"] +CMD ["pnpm", "run", "migrateandstart"] diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 66018a01c..000000000 --- a/Dockerfile +++ /dev/null @@ -1,101 +0,0 @@ -# syntax = docker/dockerfile:1.4 - -ARG NODE_VERSION=20.5.1-bullseye - -# build assets & compile TypeScript - -FROM --platform=$BUILDPLATFORM node:${NODE_VERSION} AS native-builder - -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ - rm -f /etc/apt/apt.conf.d/docker-clean \ - ; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache \ - && apt-get update \ - && apt-get install -yqq --no-install-recommends \ - build-essential curl ca-certificates - -ARG TARGETARCH - -RUN curl -L https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-$TARGETARCH-static.tar.xz -o /ffmpeg.tar.xz \ - && tar xvf /ffmpeg.tar.xz -C / --strip-components 1 --wildcards 'ffmpeg-*-static/ffmpeg' 'ffmpeg-*-static/ffprobe' - -RUN corepack enable - -WORKDIR /sharkey - -COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"] -COPY --link ["scripts", "./scripts"] -COPY --link ["packages/megalodon/package.json", "./packages/megalodon/"] -COPY --link ["packages/backend/package.json", "./packages/backend/"] -COPY --link ["packages/frontend/package.json", "./packages/frontend/"] -COPY --link ["packages/sw/package.json", "./packages/sw/"] -COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"] - -RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ - pnpm i --frozen-lockfile --aggregate-output - -COPY --link . ./ - -ARG NODE_ENV=production - -RUN git submodule update --init -RUN pnpm build -RUN rm -rf .git/ - -# build native dependencies for target platform - -FROM --platform=$TARGETPLATFORM node:${NODE_VERSION} AS target-builder - -RUN apt-get update \ - && apt-get install -yqq --no-install-recommends \ - build-essential - -RUN corepack enable - -WORKDIR /sharkey - -COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"] -COPY --link ["scripts", "./scripts"] -COPY --link ["packages/megalodon/package.json", "./packages/megalodon/"] -COPY --link ["packages/backend/package.json", "./packages/backend/"] - -RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ - pnpm i --frozen-lockfile --aggregate-output - -FROM --platform=$TARGETPLATFORM node:${NODE_VERSION}-slim AS runner - -ARG UID="991" -ARG GID="991" - -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - tini curl libjemalloc-dev libjemalloc2 \ - && ln -s /usr/lib/$(uname -m)-linux-gnu/libjemalloc.so.2 /usr/local/lib/libjemalloc.so \ - && corepack enable \ - && groupadd -g "${GID}" sharkey \ - && useradd -l -u "${UID}" -g "${GID}" -m -d /sharkey sharkey \ - && find / -type d -path /proc -prune -o -type f -perm /u+s -ignore_readdir_race -exec chmod u-s {} \; \ - && find / -type d -path /proc -prune -o -type f -perm /g+s -ignore_readdir_race -exec chmod g-s {} \; \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists - -USER sharkey -WORKDIR /sharkey - -COPY --chown=sharkey:sharkey --from=target-builder /sharkey/node_modules ./node_modules -COPY --chown=sharkey:sharkey --from=target-builder /sharkey/packages/megalodon/node_modules ./packages/megalodon/node_modules -COPY --chown=sharkey:sharkey --from=target-builder /sharkey/packages/backend/node_modules ./packages/backend/node_modules -COPY --chown=sharkey:sharkey --from=native-builder /ffmpeg /usr/local/bin/ -COPY --chown=sharkey:sharkey --from=native-builder /ffprobe /usr/local/bin/ -COPY --chown=sharkey:sharkey --from=native-builder /sharkey/built ./built -COPY --chown=sharkey:sharkey --from=native-builder /sharkey/packages/megalodon/lib ./packages/megalodon/lib -COPY --chown=sharkey:sharkey --from=native-builder /sharkey/packages/backend/built ./packages/backend/built -COPY --chown=sharkey:sharkey --from=native-builder /sharkey/fluent-emojis /sharkey/fluent-emojis -COPY --chown=sharkey:sharkey . ./ - -ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so -ENV NODE_ENV=production -VOLUME "/sharkey/files" -HEALTHCHECK --interval=5s --retries=20 CMD ["/bin/bash", "/sharkey/healthcheck.sh"] -ENTRYPOINT ["/usr/bin/tini", "--"] -CMD ["pnpm", "run", "migrateandstart"] diff --git a/scripts/trim-deps.mjs b/scripts/trim-deps.mjs new file mode 100644 index 000000000..2983f28cb --- /dev/null +++ b/scripts/trim-deps.mjs @@ -0,0 +1,35 @@ +// trims dependencies for production +// only run after a full build + +import fs from 'node:fs' + +const checks = ['dependencies', 'optionalDependencies', 'devDependencies'] + +function removeDeps(path, patterns) { + let pkg = JSON.parse(fs.readFileSync(path)); + for (const pattern of patterns) { + if (typeof pattern === 'string') { + for (const check of checks) { + if (pkg[check] !== undefined && pkg[check][pattern] !== undefined) { + delete pkg[check][pattern]; + } + } + } else if (pattern instanceof RegExp) { + for (const check of checks) { + if (pkg[check] !== undefined) { + for (const dep of Object.keys(pkg[check])) { + if (pattern.exec(dep) !== null) { + delete pkg[check][dep]; + } + } + } + } + } + } + fs.writeFileSync(path, JSON.stringify(pkg, undefined, 2)); +} + +removeDeps('package.json', ['execa', 'cssnano', 'postcss', 'terser', 'typescript']) +removeDeps('packages/backend/package.json', ['bufferutil', 'utf-8-validate', /^@swc\//, 'typescript']) +removeDeps('packages/megalodon/package.json', [/^@types\//, 'typescript']) +removeDeps('packages/misskey-js/package.json', [/^@swc\//, 'typescript']) From 5aaef3f5b6ec9b101d7df237fecc0a82605ebf2a Mon Sep 17 00:00:00 2001 From: mia <74628488+squili@users.noreply.github.com> Date: Thu, 7 Dec 2023 16:42:53 -0800 Subject: [PATCH 2/2] containerfile -> dockerfile --- Containerfile => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Containerfile => Dockerfile (100%) diff --git a/Containerfile b/Dockerfile similarity index 100% rename from Containerfile rename to Dockerfile