Merge branch 'v2' of github.com:ist-bot-team/ist-discord-bot into v2

ist-bot-team · Sep 18, 2021 · 79d2c0c · 79d2c0c
2 parents 3fa116b + 993abbf
commit 79d2c0c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+engine-strict=true
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,11 @@
+FROM node:16.6.1-alpine3.14
+ARG DATABASE_URL
+ENV DATABASE_URL ${DATABASE_URL}
+WORKDIR /app
+COPY package.json .
+COPY yarn.lock .
+RUN yarn install --frozen-lockfile
+COPY ./ ./
+RUN yarn run prisma generate
+RUN yarn build
+CMD [ "yarn", "start:docker" ]
diff --git a/README.md b/README.md
@@ -22,6 +22,7 @@ services:
         ## OR:
         build:
             context: .
+            dockerfile: Dockerfile.dev
             args:
                 DATABASE_URL: file:/app/data/bot.db
         ## END;

diff --git a/package.json b/package.json
@@ -14,6 +14,10 @@
 	"repository": "[email protected]:ist-bot-team/ist-discord-bot",
 	"author": "IST Bot Team",
 	"license": "MIT",
+	"engines": {
+		"node": ">=16.6.1",
+		"npm": ">=7.23.0"
+	},
 	"dependencies": {
 		"@discordjs/builders": "^0.6.0",
 		"@discordjs/rest": "^0.1.0-canary.0",
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ services: @@
             ## OR:
             build:
                 context: .
+                dockerfile: Dockerfile.dev
                 args:
                     DATABASE_URL: file:/app/data/bot.db
             ## END;
@@ Expand Down @@