summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-05-19 03:22:41 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-05-19 03:22:41 +0900
commit7fade8939d17ec47325eca4d71c58088638c502d (patch)
tree337abf0083d45107986447b05fb6e00ba16870c3
parentMerge branch 'develop' (diff)
parent11.16.1 (diff)
downloadmisskey-7fade8939d17ec47325eca4d71c58088638c502d.tar.gz
misskey-7fade8939d17ec47325eca4d71c58088638c502d.tar.bz2
misskey-7fade8939d17ec47325eca4d71c58088638c502d.zip
Merge branch 'develop'
-rw-r--r--CHANGELOG.md5
-rw-r--r--Dockerfile2
-rw-r--r--package.json2
3 files changed, 7 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ffc8cc864..6c6143ab87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,11 @@ mongodb:
8. master ブランチに戻す
9. enjoy
+11.16.1 (2019/05/19)
+--------------------
+### 🐛Fixes
+* Dockerで起動できない問題を修正
+
11.16.0 (2019/05/19)
--------------------
### 注意
diff --git a/Dockerfile b/Dockerfile
index e5e6c06a61..940a22d0f7 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", "migrateandstart"]
+CMD ["npm", "run", "migrateandstart"]
diff --git a/package.json b/package.json
index 0e9e46e1ff..5776c78f93 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
- "version": "11.16.0",
+ "version": "11.16.1",
"codename": "daybreak",
"repository": {
"type": "git",