Skip to content

Commit

Permalink
fix: 🐛 merge video
Browse files Browse the repository at this point in the history
  • Loading branch information
caorushizi committed Oct 4, 2024
1 parent b06a14f commit 175b528
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 3 deletions.
1 change: 1 addition & 0 deletions .cspell/custom-words.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
acodec
adblocker
ahooks
aliyuncs
antd
aplus
behaviour
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ WORKDIR /app
COPY --from=builder /app /app

# COPY --from=deb_extractor /dpkg /
RUN apt-get update && apt-get install -y libicu-dev
RUN apt-get update && apt-get install -y libicu-dev ffmpeg

RUN npm install pm2 -g

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"build:renderer": "pnpm -F renderer run build",
"build:mobile": "pnpm -F mobile run build",
"build:docker": "tsx scripts/web.ts && docker buildx build -t caorushizi/mediago:latest .",
"rebuild:web": "pnpm -F renderer run rebuild",
"rebuild:web": "pnpm -F backend rebuild",
"rebuild:electron": "pnpm -F main run rebuild",
"beta": "pnpm run build && pnpm -F mediago run pack",
"release": "pnpm run build && pnpm -F main run release",
Expand Down
11 changes: 10 additions & 1 deletion packages/backend/scripts/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,16 @@ async function buildClean() {
async function copyBin() {
const source = mainResolve("../main/bin", isDev ? process.platform : "linux");
const target = mainResolve("dist/server/bin");
fs.cpSync(source, target, { recursive: true });
fs.cpSync(source, target, {
recursive: true,
filter: (src) => {
if (!isDev && src.endsWith("ffmpeg")) {
return false;
}

return true;
},
});
}

const copy = gulp.parallel(copyBin);
Expand Down

0 comments on commit 175b528

Please sign in to comment.