Merge branch 'main' into feature/autoplay-next-video-1308

code100x · Oct 9, 2024 · 495906b · 495906b
2 parents 4e2dbd6 + 6a49a64
commit 495906b
Show file tree

Hide file tree

Showing 31 changed files with 1,210 additions and 428 deletions.
diff --git a/.husky/post-merge b/.husky/post-merge
diff --git a/.husky/pre-commit b/.husky/pre-commit
diff --git a/Dockerfile.prod b/Dockerfile.prod
@@ -1,17 +1,17 @@
 FROM node:20-alpine AS build
 
 WORKDIR /usr/src/app
-ARG DATABASE_URL 
+ARG DATABASE_URL
+ENV DATABASE_URL=${DATABASE_URL}
 
 COPY . .
 
 RUN npm install -g pnpm && \
   pnpm install && \
   pnpm add sharp && \
-  pnpm run build && \
-  DATABASE_URL=$DATABASE_URL pnpm dlx prisma generate 
-
+  pnpm run build
 
+RUN DATABASE_URL=${DATABASE_URL} pnpm dlx prisma generate
 
 FROM node:20-alpine AS run
 
@@ -25,7 +25,7 @@ COPY --from=build --chown=1001:1001 usr/src/app/.next/static ./.next/static
 COPY --from=build --chown=1001:1001 usr/src/app/public ./public
 
 ENV NODE_ENV production
-ENV PORT 3000 
+ENV PORT 3000
 ENV HOSTNAME "0.0.0.0"
 
 CMD [ "node", "server.js" ]
diff --git a/package.json b/package.json
@@ -24,7 +24,6 @@
     "db:seed": "prisma db seed",
     "db:reset": "prisma migrate reset",
     "update:videometadata": "ts-node --compiler-options \"{\\\"module\\\": \\\"CommonJS\\\"}\" ./src/scripts/updateVideoMetaData.ts",
-    "prepare": "husky install",
     "studio": "prisma studio",
     "studio:docker": "open http://localhost:5555 || start http://localhost:5555",
     "storybook": "concurrently 'yarn:watch:*'",
@@ -130,7 +129,6 @@
     "autoprefixer": "^10.0.1",
     "eslint": "^8.56.0",
     "eslint-plugin-storybook": "^0.8.0",
-    "husky": "^9.0.7",
     "jsdom": "^24.0.0",
     "postcss": "^8",
     "prettier": "^3.2.4",