diff options
| author | anatawa12 <anatawa12@icloud.com> | 2023-12-28 07:52:08 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-28 07:52:08 +0900 |
| commit | 8753f9ef063f0129b6372c564b7500892b016daf (patch) | |
| tree | 5b168ba7225c9d1c125d0e60524a458422903812 | |
| parent | Update CHANGELOG.md (#12826) (diff) | |
| download | misskey-8753f9ef063f0129b6372c564b7500892b016daf.tar.gz misskey-8753f9ef063f0129b6372c564b7500892b016daf.tar.bz2 misskey-8753f9ef063f0129b6372c564b7500892b016daf.zip | |
fix: running from docker is broken (#12824)
* fix: running from docker is broken
* fix: dependencies of misskey-js not found from backend
* docs(changelog): Dockerでサーバーを起動できない問題を修正
* Update CHANGELOG.md
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | Dockerfile | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ddd779429..69f30f9232 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,11 @@ --> +## 2023.12.2 + +### General +- v2023.12.1でDockerを利用してサーバーを起動できない問題を修正 + ## 2023.12.1 ### Note diff --git a/Dockerfile b/Dockerfile index 38aa5bc7b3..922ce4dca3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,7 @@ WORKDIR /misskey COPY --link ["pnpm-lock.yaml", "pnpm-workspace.yaml", "package.json", "./"] COPY --link ["scripts", "./scripts"] COPY --link ["packages/backend/package.json", "./packages/backend/"] +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 @@ -77,7 +78,9 @@ WORKDIR /misskey COPY --chown=misskey:misskey --from=target-builder /misskey/node_modules ./node_modules COPY --chown=misskey:misskey --from=target-builder /misskey/packages/backend/node_modules ./packages/backend/node_modules +COPY --chown=misskey:misskey --from=target-builder /misskey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules COPY --chown=misskey:misskey --from=native-builder /misskey/built ./built +COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/built ./packages/misskey-js/built COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis COPY --chown=misskey:misskey . ./ |