cywiriadau achos diwedd Python2 / fixes because of Python EOL

Dockerfile

@@ -4,9 +4,18 @@ RUN dpkg --add-architecture i386
 
 RUN apt-get update \
  && DEBIAN_FRONTEND=noninteractive apt-get install -y default-jdk vim git curl wget zip locales maven \
- python3 python3-pip software-properties-common \
+ software-properties-common build-essential cmake libssl-dev libboost-all-dev zlib1g-dev libffi-dev \
  && rm -rf /var/lib/apt/lists/*
 
+# Upgrade to Python3.7
+RUN wget -c https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tar.xz && \
+ tar xf Python-3.7.4.tar.xz && \
+ cd Python-3.7.4 && ./configure -q && make && make install && \
+ apt update && \
+ apt install -y python3 python3-dev python3-setuptools python3-pip
+
+RUN python3 -m pip install --upgrade pip 
+
 # Set the locale
 RUN locale-gen cy_GB.UTF-8
 ENV LANG cy_GB.UTF-8

README.md

@@ -33,6 +33,8 @@ Ac yna:
 
 Bydd hyn yn cychwyn gweinydd testun-i-leferydd gyda'r llais Cymraeg (wispr-cy-male-unitselection-general) yn barod i'w ddefnyddio. 
 
-Agorwch borwr ac ewch i `http:https://localhost:52010` i'w glywed yn ynganu eich testunau.
+Agorwch borwr ac ewch i `http:https://localhost:52010` i'w glywed yn ynganu eich testunau neu defnyddiwch y gorchymyn CURL:
+
+ $ curl -o sound.wav "http:https://localhost:52010/process?INPUT_TEXT=Helo+pawb&INPUT_TYPE=TEXT&OUTPUT_TYPE=AUDIO&AUDIO=WAVE&VOICE=wispr&LOCALE=cy"
 
 

server/Dockerfile

@@ -11,10 +11,7 @@ ADD cherrypy/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 WORKDIR /opt/marytts-server
 
 RUN pip3 install --upgrade pip
-RUN pip3 install -r requirements.txt 
-
-#RUN mkdir -p /var/log/gunicorn \
-# && touch /var/log/gunicorn/marytts-api.error.log
+RUN python3 -m pip install -r requirements.txt 
 
 EXPOSE 8008