From 539f80f5fa590e712b5c05f1b1c33ae4bc91d1d3 Mon Sep 17 00:00:00 2001
From: Lio Young <blade@werewolf.design>
Date: Thu, 8 Jul 2021 13:45:56 +0200
Subject: [PATCH] update scripts

---
 .gitignore         |  1 +
 Dockerfile         |  2 +-
 docker-compose.yml |  2 ++
 package.json       | 11 +++++++----
 src/utils/types.ts |  7 +------
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index f216a68..d8e8537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules/
 build/
 logs/
 .vscode
+.env*
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index cb14e07..dc1db1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ RUN tsc --sourceMap false
 RUN rm -rf src
 RUN npm cache clean --force
 
-ENTRYPOINT [ "npm", "run", "start"]
\ No newline at end of file
+ENTRYPOINT [ "npm", "run", "node:start"]
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index b9d853b..d643c90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,6 +24,8 @@ services:
     volumes:
       - grafana:/var/lib/grafana
   bot:
+    env_file:
+      - .env.thaldrin.etc
     container_name: thaldrin
     restart: always
     hostname: thaldrin
diff --git a/package.json b/package.json
index 5459d55..b5a2b27 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,13 @@
   "description": "",
   "main": "build/shard.js",
   "scripts": {
-    "build": "rm -rf build/ && tsc",
-    "start": "node build/shard.js",
-    "dev": "nodemon --ignore \"build/\" -e js,ts --exec \"npm run build && npm run start\"",
-    "init": "npm run subs:init && npm run subs:update",
+    "node:build": "rm -rf build/ && tsc",
+    "node:start": "node build/shard.js",
+    "node:dev": "nodemon --ignore \"build/\" -e js,ts --exec \"npm run build && npm run start\"",
+    "docker:build": "docker-compose build",
+    "docker:start": "docker-compose up -d",
+    "docker:down": "docker-compose down",
+    "git:init": "npm run subs:init && npm run subs:update",
     "subs:init": "git submodule init && git submodule update",
     "subs:update": "git submodule update --remote"
   },
diff --git a/src/utils/types.ts b/src/utils/types.ts
index 7b3ee99..31e3135 100644
--- a/src/utils/types.ts
+++ b/src/utils/types.ts
@@ -210,10 +210,5 @@ interface Repository {
 }
 
 interface Scripts {
-    build: string;
-    start: string;
-    dev: string;
-    init: string;
-    "subs:init": string;
-    "subs:update": string;
+    [script: string]: string
 }
\ No newline at end of file