fix the installation on Ubuntu docker images and update Pipfile lock

baxtree · Oct 5, 2020 · 8750f25 · 8750f25
1 parent a564fd5
commit 8750f25
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 41 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -22,11 +22,6 @@ $ pip install subaligner
 ```
 or
 ```
-# Install via pipx
-pipx install subaligner
-```
-or
-```
 # Install from GitHub via Pipenv
 ...
 [packages]
@@ -67,13 +62,6 @@ or
 $ subaligner -m single -v video.mp4 -s subtitle.srt
 $ subaligner -m dual -v video.mp4 -s subtitle.srt
 
-```
-```
-# Run alignments with pipx
-
-$ pipx run subaligner -m single -v video.mp4 -s subtitle.srt
-$ pipx run subaligner -m dual -v video.mp4 -s subtitle.srt
-
 ```
 ```
 # Run the module as a script

diff --git a/docker/Dockerfile-Ubuntu18 b/docker/Dockerfile-Ubuntu18
@@ -1,6 +1,8 @@
 # Subaligner Ubuntu 18 Docker Image
 FROM ubuntu:18.04
 
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Europe/London
 RUN apt-get -y update &&\
     apt-get -y install ffmpeg &&\
     apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\

diff --git a/docker/Dockerfile-Ubuntu19 b/docker/Dockerfile-Ubuntu19
@@ -1,6 +1,8 @@
 # Subaligner Ubuntu 19 Docker Image
 FROM ubuntu:19.10
 
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Europe/London
 RUN apt-get -y update &&\
     apt-get -y install ffmpeg &&\
     apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\

diff --git a/docker/Dockerfile-Ubuntu20 b/docker/Dockerfile-Ubuntu20
@@ -1,6 +1,8 @@
 # Subaligner Ubuntu 20 Docker Image
 FROM ubuntu:20.04
 
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Europe/London
 RUN apt-get -y update &&\
     apt-get -y install ffmpeg &&\
     apt-get -y install espeak libespeak1 libespeak-dev espeak-data &&\

diff --git a/site/source/installation.rst b/site/source/installation.rst
@@ -18,10 +18,6 @@ Installation
     $ pip install numpy
     $ pip install subaligner
 
-**Install Subaligner via pipx**::
-
-    $ pipx install subaligner
-
 **Install from GitHub via Pipenv**::
 
     ...

diff --git a/site/source/usage.rst b/site/source/usage.rst
@@ -29,11 +29,6 @@ Make sure you have got the virtual environment activated upfront.
     $ docker run -v `pwd`:`pwd` -w `pwd` -it baxtree/subaligner subaligner_1pass -v video.mp4 -s subtitle.srt
     $ docker run -v `pwd`:`pwd` -w `pwd` -it baxtree/subaligner subaligner_2pass -v video.mp4 -s subtitle.srt
 
-**Run alignments with pipx**::
-
-    $ pipx run subaligner -m single -v video.mp4 -s subtitle.srt
-    $ pipx run subaligner -m dual -v video.mp4 -s subtitle.srt
-
 **Run the module as a script**::
 
     $ python -m subaligner -m single -v video.mp4 -s subtitle.srt