Trying to fix build

cataclym · Dec 18, 2024 · 6182245 · 6182245
1 parent 6d2c2bf
commit 6182245
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,10 @@
-FROM node:20
-LABEL authors="Ole"
+FROM node:20 AS build
+LABEL authors="Catadev"
 
 WORKDIR /kaikibot
 RUN apt update && curl -sLO https://github.com/fastfetch-cli/fastfetch/releases/latest/download/fastfetch-linux-amd64.deb && dpkg -i fastfetch-linux-amd64.deb
 COPY package*.json .
-RUN npm install
-COPY prisma .
-RUN npx prisma generate
+RUN npm i --include dev
 COPY . .
-RUN npm run build
-CMD ["npm", "run", "start_docker"]
+RUN npx prisma generate
+RUN npx tsc -p tsconfig.json
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
     db:
         image: mariadb:latest
@@ -21,7 +19,7 @@ services:
         build:
             context: .
             args:
-                - DATABASE_URL=$DATABASE_URL
+                - DATABASE_URL=$DATABASE_URL_DOCKER_BUILD
         restart: unless-stopped
         env_file: ./.env
         stdin_open: true

diff --git a/package-lock.json b/package-lock.json