mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-27 22:38:10 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request '[PR]: fix: add megalodon to docker' (#10423) from fix/megalodon-docker into develop

Browse Source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10423
This commit is contained in:
Kainoa Kanter 2023-07-07 03:15:17 +00:00
commit 2f1174c994
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.dockerignore
View File

@ -1,12 +1,8 @@
# Visual Studio Code
/.vscode
!/.vscode/extensions.json
.vscode
# Intelij-IDEA
/.idea
packages/backend/.idea/backend.iml
packages/backend/.idea/modules.xml
packages/backend/.idea/vcs.xml
.idea
# Node.js
node_modules
@ -14,7 +10,7 @@ node_modules
report.*.json
# Rust
packages/backend/native-utils/target/*
packages/backend/native-utils/target
# Cypress
cypress/screenshots
@ -24,9 +20,7 @@ cypress/videos
coverage
# config
/.config/*
!/.config/example.yml
!/.config/docker_example.env
/.config
# misskey
built

7
Dockerfile
View File

@ -21,6 +21,7 @@ COPY packages/backend/package.json packages/backend/package.json
COPY packages/client/package.json packages/client/package.json
COPY packages/sw/package.json packages/sw/package.json
COPY packages/calckey-js/package.json packages/calckey-js/package.json
COPY packages/megalodon/package.json packages/megalodon/package.json
COPY packages/backend/native-utils/package.json packages/backend/native-utils/package.json
COPY packages/backend/native-utils/npm/linux-x64-musl/package.json packages/backend/native-utils/npm/linux-x64-musl/package.json
COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/backend/native-utils/npm/linux-arm64-musl/package.json
@ -29,10 +30,7 @@ COPY packages/backend/native-utils/npm/linux-arm64-musl/package.json packages/ba
RUN corepack enable && corepack prepare pnpm@latest --activate && pnpm i --frozen-lockfile
# Copy in the rest of the native-utils rust files
COPY packages/backend/native-utils/.cargo packages/backend/native-utils/.cargo
COPY packages/backend/native-utils/build.rs packages/backend/native-utils/
COPY packages/backend/native-utils/src packages/backend/native-utils/src/
COPY packages/backend/native-utils/migration/src packages/backend/native-utils/migration/src/
COPY packages/backend/native-utils packages/backend/native-utils/
# Compile native-utils
RUN pnpm run --filter native-utils build
@ -59,6 +57,7 @@ COPY --from=build /calckey/packages/backend/node_modules /calckey/packages/backe
COPY --from=build /calckey/packages/sw/node_modules /calckey/packages/sw/node_modules
COPY --from=build /calckey/packages/client/node_modules /calckey/packages/client/node_modules
COPY --from=build /calckey/packages/calckey-js/node_modules /calckey/packages/calckey-js/node_modules
COPY --from=build /calckey/packages/megalodon/node_modules /calckey/packages/megalodon/node_modules
# Copy the finished compiled files
COPY --from=build /calckey/built /calckey/built