From a21357248f83703acaba68e6adf5c9b5695da749 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 16 May 2019 16:12:30 +0900
Subject: [PATCH] =?UTF-8?q?Docker=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=97?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E5=A0=B4=E5=90=88=E3=80=81=E3=82=A2?=
 =?UTF-8?q?=E3=83=97=E3=83=87=E3=81=AE=E9=9A=9B=E3=81=AB=E3=83=9E=E3=82=A4?=
 =?UTF-8?q?=E3=82=B0=E3=83=AC=E3=82=92=E8=87=AA=E5=8B=95=E5=AE=9F=E8=A1=8C?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile   | 2 +-
 package.json | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8a6150876..e5e6c06a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,4 +39,4 @@ COPY --from=builder /misskey/node_modules ./node_modules
 COPY --from=builder /misskey/built ./built
 COPY . ./
 
-CMD ["npm", "start"]
+CMD ["npm", "migrateandstart"]
diff --git a/package.json b/package.json
index 8759edd4a..40f2bdd6a 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
 		"init": "node ./built/init.js",
 		"ormconfig": "node ./built/ormconfig.js",
 		"migrate": "npm run ormconfig && ts-node ./node_modules/typeorm/cli.js migration:run",
+		"migrateandstart": "npm run migrate && npm run start",
 		"build": "webpack && gulp build",
 		"webpack": "webpack",
 		"watch": "webpack --watch",