Merge branch '修接影片的問題' of https://github.com/i3thuan5/Siunn1ua2ah4.git …

…into 修接影片的問題
i3thuan5 · Nov 16, 2018 · 6c5f834 · 6c5f834
2 parents 3f1384a + bc65c48
commit 6c5f834
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
-FROM ubuntu:latest
+FROM ubuntu:16.04
 MAINTAINER sih4sing5hong5
 
-RUN apt-get update #20180423
+RUN apt-get update
 RUN apt-get install -y python3 g++ python3-dev
 RUN apt-get install -y libav-tools
 RUN apt-get install -y locales

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.5'
 services:
   gunicorn:
     build: .
-    command: gunicorn siunn1ua2ah4.wsgi --log-level debug -w 2 -b 0.0.0.0:8000
+    command: gunicorn siunn1ua2ah4.wsgi --log-level DEBUG -w 2 -b 0.0.0.0:8000
     volumes:
       - ./hok8_bu7/local.py:/usr/local/hok8-bu7/hok8_bu7/local.py
     expose:

diff --git a/鬥做伙/做影片.py b/鬥做伙/做影片.py
@@ -76,6 +76,7 @@ def 敆做伙(cls, 圖陣列, 聲陣列, 字陣列, 存檔所在):
                 '-safe', '0',
                 '-i', 全部結果表,
                 '-c', 'copy',
+                '-y',
                 存檔所在
             ]
             cls._走指令(敆做伙指令)