Fix dependencies

Dockerfile.amd64

@@ -1,18 +1,18 @@
 FROM amd64/ubuntu:bionic
 
-ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 locales mpg123 python3 opus-tools libpython3.6 libatlas3-base libexpat1'
-ARG BUILD_PACKAGES='git python3-dev libjack-jackd2-dev portaudio19-dev libxml2-dev libxslt-dev libffi-dev libssl-dev \
-build-essential swig sox libatlas-base-dev python3-pip python3-setuptools'
-ARG PIP_PACKAGES='SpeechRecognition beautifulsoup4 gTTS pyaudio python-mpd2 requests[socks] urllib3 wikipedia'
+ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 lame libatlas3-base libexpat1 libpython3.6 locales mpg123 opus-tools \
+python3 python3-setuptools'
+ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libtool libxml2-dev \
+libxslt-dev portaudio19-dev python3-dev python3-pip python3-wheel sox swig'
 
 RUN apt-get update -y && \
     apt-get -y install --no-install-recommends $RUNTIME_PACKAGES && \
     apt-mark manual $(apt-mark showauto) && \
     apt-get -y install --no-install-recommends $BUILD_PACKAGES && \
-    pip3 install $PIP_PACKAGES && \
     cd /usr/share/locale/ && ls | grep -v 'ru\|en\|locale.alias' | xargs rm -rf && \
     locale-gen ru_RU.UTF-8 && \
     git clone https://github.com/Aculeasis/mdmTerminal2.git /opt/term && \
+    pip3 install -r /opt/term/Requirements/pip-requirements.txt && \
     /opt/term/scripts/snowboy_build.sh && \
     cp -R /opt/term/src/ /opt/mdmterminal2/ && \
     mkdir /opt/cfg && \

Dockerfile.arm32v7

@@ -1,18 +1,18 @@
 FROM arm32v7/ubuntu:bionic
 
-ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 locales mpg123 python3 opus-tools libpython3.6 libatlas3-base libexpat1'
-ARG BUILD_PACKAGES='git python3-dev libjack-jackd2-dev portaudio19-dev libxml2-dev libxslt-dev libffi-dev libssl-dev \
-build-essential swig sox libatlas-base-dev python3-pip python3-setuptools'
-ARG PIP_PACKAGES='SpeechRecognition beautifulsoup4 gTTS pyaudio python-mpd2 requests[socks] urllib3 wikipedia'
+ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 lame libatlas3-base libexpat1 libpython3.6 locales mpg123 opus-tools \
+python3 python3-setuptools'
+ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libtool libxml2-dev \
+libxslt-dev portaudio19-dev python3-dev python3-pip python3-wheel sox swig'
 
 RUN apt-get update -y && \
     apt-get -y install --no-install-recommends $RUNTIME_PACKAGES && \
     apt-mark manual $(apt-mark showauto) && \
     apt-get -y install --no-install-recommends $BUILD_PACKAGES && \
-    pip3 install $PIP_PACKAGES && \
     cd /usr/share/locale/ && ls | grep -v 'ru\|en\|locale.alias' | xargs rm -rf && \
     locale-gen ru_RU.UTF-8 && \
     git clone https://github.com/Aculeasis/mdmTerminal2.git /opt/term && \
+    pip3 install -r /opt/term/Requirements/pip-requirements.txt && \
     /opt/term/scripts/snowboy_build.sh && \
     cp -R /opt/term/src/ /opt/mdmterminal2/ && \
     mkdir /opt/cfg && \

Dockerfile.arm64v8

@@ -1,18 +1,18 @@
 FROM arm64v8/ubuntu:bionic
 
-ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 locales mpg123 python3 opus-tools libpython3.6 libatlas3-base libexpat1'
-ARG BUILD_PACKAGES='git python3-dev libjack-jackd2-dev portaudio19-dev libxml2-dev libxslt-dev libffi-dev libssl-dev \
-build-essential swig sox libatlas-base-dev python3-pip python3-setuptools'
-ARG PIP_PACKAGES='SpeechRecognition beautifulsoup4 gTTS pyaudio python-mpd2 requests[socks] urllib3 wikipedia'
+ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 lame libatlas3-base libexpat1 libpython3.6 locales mpg123 opus-tools \
+python3 python3-setuptools'
+ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libtool libxml2-dev \
+libxslt-dev portaudio19-dev python3-dev python3-pip python3-wheel sox swig'
 
 RUN apt-get update -y && \
     apt-get -y install --no-install-recommends $RUNTIME_PACKAGES && \
     apt-mark manual $(apt-mark showauto) && \
     apt-get -y install --no-install-recommends $BUILD_PACKAGES && \
-    pip3 install $PIP_PACKAGES && \
     cd /usr/share/locale/ && ls | grep -v 'ru\|en\|locale.alias' | xargs rm -rf && \
     locale-gen ru_RU.UTF-8 && \
     git clone https://github.com/Aculeasis/mdmTerminal2.git /opt/term && \
+    pip3 install -r /opt/term/Requirements/pip-requirements.txt && \
     /opt/term/scripts/snowboy_build.sh && \
     cp -R /opt/term/src/ /opt/mdmterminal2/ && \
     mkdir /opt/cfg && \

Dockerfile_rhvoice.amd64

@@ -1,11 +1,10 @@
 FROM amd64/ubuntu:bionic
 
 ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 lame libatlas3-base libexpat1 libpython3.6 locales mpg123 opus-tools \
-python3'
-ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libxml2-dev \
-libxslt-dev portaudio19-dev python3-dev python3-pip python3-setuptools python3-wheel scons sox swig'
-ARG PIP_PACKAGES='SpeechRecognition beautifulsoup4 flask gTTS pyaudio pymorphy2 python-mpd2 requests[socks] urllib3 \
-wikipedia rhvoice-wrapper rhvoice-wrapper-bin'
+python3 python3-setuptools'
+ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libtool libxml2-dev \
+libxslt-dev portaudio19-dev python3-dev python3-pip python3-wheel scons sox swig'
+ARG PIP_PACKAGES='flask pymorphy2 rhvoice-wrapper rhvoice-wrapper-bin'
 
 RUN apt-get update -y && \
     apt-get -y install --no-install-recommends $RUNTIME_PACKAGES && \
@@ -16,6 +15,7 @@ RUN apt-get update -y && \
     cd /usr/share/locale/ && ls | grep -v 'ru\|en\|locale.alias' | xargs rm -rf && \
     locale-gen ru_RU.UTF-8 && \
     git clone https://github.com/Aculeasis/mdmTerminal2.git /opt/term && \
+    pip3 install -r /opt/term/Requirements/pip-requirements.txt && \
     /opt/term/scripts/snowboy_build.sh && \
     cp -R /opt/term/src/ /opt/mdmterminal2/ && \
     git clone https://github.com/vantu5z/RHVoice-dictionary.git /opt/RHVoice-dictionary && \

Dockerfile_rhvoice.arm32v7

@@ -1,11 +1,10 @@
 FROM arm32v7/ubuntu:bionic
 
 ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 lame libatlas3-base libexpat1 libpython3.6 locales mpg123 opus-tools \
-python3'
-ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libxml2-dev \
-libxslt-dev portaudio19-dev python3-dev python3-pip python3-setuptools python3-wheel scons sox swig'
-ARG PIP_PACKAGES='SpeechRecognition beautifulsoup4 flask gTTS pyaudio pymorphy2 python-mpd2 requests[socks] urllib3 \
-wikipedia rhvoice-wrapper rhvoice-wrapper-bin'
+python3 python3-setuptools'
+ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libtool libxml2-dev \
+libxslt-dev portaudio19-dev python3-dev python3-pip python3-wheel scons sox swig'
+ARG PIP_PACKAGES='flask pymorphy2 rhvoice-wrapper rhvoice-wrapper-bin'
 
 RUN apt-get update -y && \
     apt-get -y install --no-install-recommends $RUNTIME_PACKAGES && \
@@ -16,6 +15,7 @@ RUN apt-get update -y && \
     cd /usr/share/locale/ && ls | grep -v 'ru\|en\|locale.alias' | xargs rm -rf && \
     locale-gen ru_RU.UTF-8 && \
     git clone https://github.com/Aculeasis/mdmTerminal2.git /opt/term && \
+    pip3 install -r /opt/term/Requirements/pip-requirements.txt && \
     /opt/term/scripts/snowboy_build.sh && \
     cp -R /opt/term/src/ /opt/mdmterminal2/ && \
     git clone https://github.com/vantu5z/RHVoice-dictionary.git /opt/RHVoice-dictionary && \

Dockerfile_rhvoice.arm64v8

@@ -1,22 +1,21 @@
 FROM arm64v8/ubuntu:bionic
 
 ARG RUNTIME_PACKAGES='alsa-utils flac iproute2 lame libatlas3-base libexpat1 libpython3.6 locales mpg123 opus-tools \
-python3'
-ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libxml2-dev \
-libxslt-dev portaudio19-dev python3-dev python3-pip python3-setuptools python3-wheel sox swig'
-ARG PIP_PACKAGES='SpeechRecognition beautifulsoup4 flask gTTS pyaudio pymorphy2 python-mpd2 requests[socks] urllib3 \
-wikipedia rhvoice-wrapper'
+python3 python3-setuptools'
+ARG BUILD_PACKAGES='build-essential git libatlas-base-dev libffi-dev libjack-jackd2-dev libssl-dev libtool libxml2-dev \
+libxslt-dev portaudio19-dev python3-dev python3-pip python3-wheel scons sox swig'
+ARG PIP_PACKAGES='flask pymorphy2 rhvoice-wrapper rhvoice-wrapper-bin'
 
 RUN apt-get update -y && \
     apt-get -y install --no-install-recommends $RUNTIME_PACKAGES && \
     apt-mark manual $(apt-mark showauto) && \
     apt-get -y install --no-install-recommends $BUILD_PACKAGES && \
     pip3 install $PIP_PACKAGES && \
-    pip3 install https://github.com/Aculeasis/rhvoice-wrapper-bin/releases/download/0.1.3/rhvoice_wrapper_bin-0.1.3-py3-none-linux_aarch64.whl && \
     echo "$(pip3 show rhvoice-wrapper-bin | grep Location | awk '{print $2}')/rhvoice_wrapper_bin/lib/" > /opt/LIBRARY_PATH && \
     cd /usr/share/locale/ && ls | grep -v 'ru\|en\|locale.alias' | xargs rm -rf && \
     locale-gen ru_RU.UTF-8 && \
     git clone https://github.com/Aculeasis/mdmTerminal2.git /opt/term && \
+    pip3 install -r /opt/term/Requirements/pip-requirements.txt && \
     /opt/term/scripts/snowboy_build.sh && \
     cp -R /opt/term/src/ /opt/mdmterminal2/ && \
     git clone https://github.com/vantu5z/RHVoice-dictionary.git /opt/RHVoice-dictionary && \

README.md

@@ -47,7 +47,6 @@
 - rhvoice-rest тут не доступен за пределами контейнера. Конечно, лучше использовать для него отдельный образ: mdmTerminal 2 + [rhvoice-rest](https://github.com/Aculeasis/rhvoice-rest)
 - mdmTerminal 2 имеет больше настроек чем оригинальный mdmPiTerminal, не все из них доступны через MDM VoiceAssistant - редактируйте settings.ini
 - Чтобы не терять данные при обновленях, нужно вынести на хост (через -v): `/opt/mdmterminal2/tts_cache`, `/opt/mdmterminal2/resources/models` и `/opt/cfg`
-- `Dockerfile_rhvoice.arm64v8` использует заранее собранный `rhvoice-wrapper-bin` (зеро часто не хватает памяти на сборку)
 
 Ссылки
 ====