Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/cryptofyre/AniArtwork
Browse files Browse the repository at this point in the history
  • Loading branch information
cryptofyre committed Aug 9, 2024
2 parents 72974b1 + 32c2902 commit b7ce00a
Show file tree
Hide file tree
Showing 6 changed files with 1,171 additions and 238 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
node_modules
yarn-error.log
.DS_Store
.git
Expand Down
925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.0.cjs

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
checksumBehavior: update

compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.4.0.cjs
8 changes: 4 additions & 4 deletions dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Use the latest Node.js image with Yarn pre-installed as a base
FROM oven/bun:canary-alpine
FROM node:18-alpine

# Set the working directory
WORKDIR /usr/src/app
WORKDIR /app

# Install FFmpeg
RUN apk add --update-cache ffmpeg make gcc g++ python3
Expand All @@ -11,7 +11,7 @@ RUN apk add --update-cache ffmpeg make gcc g++ python3
COPY package.json yarn.lock ./

# Install dependencies using Yarn
RUN bun install
RUN npm install

# Copy the rest of the application code
COPY . .
Expand All @@ -20,4 +20,4 @@ COPY . .
EXPOSE 3000

# Define the command to run the application
CMD ["bun", "start"]
CMD ["node", "server.mjs"]
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{
"name": "aniart",
"packageManager": "[email protected]",
"main": "server.mjs",
"type": "module",
"scripts": {
"start": "bun server.mjs"
"start": "node server.mjs"
},
"dependencies": {
"bull": "^4.16.0",
Expand All @@ -13,5 +12,6 @@
"fluent-ffmpeg": "^2.1.3",
"node-fetch": "^3.3.2",
"winston": "^3.14.0"
}
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit b7ce00a

Please sign in to comment.