From 7a6508612d1ca974f7944e1a27e68b2185c2c3b6 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Tue, 25 Aug 2020 15:35:03 +0200
Subject: [PATCH] Revert "Merge pull request #3246 from lissyx/fix-docker"

This reverts commit c01fda56c058779cc9dba952ce940c47398c4ed3, reversing
changes made to 3e99b0d8b2b2d6e47c8ff7eb1dfd9a88eba8e6d8.
---
 Dockerfile.build.tmpl | 22 +++++++++++-----------
 Dockerfile.train.tmpl | 10 ++++------
 setup.py              |  2 +-
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Dockerfile.build.tmpl b/Dockerfile.build.tmpl
index 12ce1989..354cf6e3 100644
--- a/Dockerfile.build.tmpl
+++ b/Dockerfile.build.tmpl
@@ -114,14 +114,14 @@ RUN echo "build --spawn_strategy=standalone --genrule_strategy=standalone" \
 WORKDIR /
 
 RUN git clone --recursive $MOZILLA_VOICE_STT_REPO
-WORKDIR /STT
+WORKDIR /DeepSpeech
 RUN git checkout $MOZILLA_VOICE_STT_SHA
 RUN git submodule sync tensorflow/
 RUN git submodule update --init tensorflow/
 
 # >> START Build and bind
 
-WORKDIR /STT/tensorflow
+WORKDIR /DeepSpeech/tensorflow
 
 # Fix for not found script https://github.com/tensorflow/tensorflow/issues/471
 RUN ./configure
@@ -132,7 +132,7 @@ RUN ./configure
 
 # passing LD_LIBRARY_PATH is required cause Bazel doesn't pickup it from environment
 
-# Build Mozilla Voice STT
+# Build DeepSpeech
 RUN bazel build \
 	--workspace_status_command="bash native_client/bazel_workspace_status_cmd.sh" \
 	--config=monolithic \
@@ -153,18 +153,18 @@ RUN bazel build \
 	--verbose_failures \
 	--action_env=LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
 
-# Copy built libs to /STT/native_client
-RUN cp bazel-bin/native_client/libmozilla_voice_stt.so /STT/native_client/
+# Copy built libs to /DeepSpeech/native_client
+RUN cp bazel-bin/native_client/libmozilla_voice_stt.so /DeepSpeech/native_client/
 
 # Build client.cc and install Python client and decoder bindings
-ENV TFDIR /STT/tensorflow
+ENV TFDIR /DeepSpeech/tensorflow
 
 RUN nproc
 
-WORKDIR /STT/native_client
+WORKDIR /DeepSpeech/native_client
 RUN make NUM_PROCESSES=$(nproc) mozilla_voice_stt
 
-WORKDIR /STT
+WORKDIR /DeepSpeech
 RUN cd native_client/python && make NUM_PROCESSES=$(nproc) bindings
 RUN pip3 install --upgrade native_client/python/dist/*.whl
 
@@ -176,8 +176,8 @@ RUN pip3 install --upgrade native_client/ctcdecode/dist/*.whl
 # Allow Python printing utf-8
 ENV PYTHONIOENCODING UTF-8
 
-# Build KenLM in /STT/native_client/kenlm folder
-WORKDIR /STT/native_client
+# Build KenLM in /DeepSpeech/native_client/kenlm folder
+WORKDIR /DeepSpeech/native_client
 RUN rm -rf kenlm && \
 	git clone https://github.com/kpu/kenlm && \
 	cd kenlm && \
@@ -188,4 +188,4 @@ RUN rm -rf kenlm && \
 	make -j $(nproc)
 
 # Done
-WORKDIR /STT
+WORKDIR /DeepSpeech
diff --git a/Dockerfile.train.tmpl b/Dockerfile.train.tmpl
index 790f35f4..b289cf7a 100644
--- a/Dockerfile.train.tmpl
+++ b/Dockerfile.train.tmpl
@@ -31,11 +31,9 @@ RUN apt-get install -y --no-install-recommends libopus0 libsndfile1
 RUN rm -rf /var/lib/apt/lists/*
 
 WORKDIR /
-RUN echo git clone $MOZILLA_VOICE_STT_REPO
 RUN git clone $MOZILLA_VOICE_STT_REPO
 
-WORKDIR /STT
-RUN echo git checkout $MOZILLA_VOICE_STT_SHA
+WORKDIR /DeepSpeech
 RUN git checkout $MOZILLA_VOICE_STT_SHA
 
 # Build CTC decoder first, to avoid clashes on incompatible versions upgrades
@@ -45,7 +43,7 @@ RUN pip3 install --upgrade native_client/ctcdecode/dist/*.whl
 # Prepare deps
 RUN pip3 install --upgrade pip==20.0.2 wheel==0.34.2 setuptools==46.1.3
 
-# Install Mozilla Voice STT
+# Install DeepSpeech
 #  - No need for the decoder since we did it earlier
 #  - There is already correct TensorFlow GPU installed on the base image,
 #    we don't want to break that
@@ -56,7 +54,7 @@ RUN python3 util/taskcluster.py --source tensorflow --branch r1.15 \
         --artifact convert_graphdef_memmapped_format  --target .
 
 # Build KenLM to generate new scorers
-WORKDIR /STT/native_client
+WORKDIR /DeepSpeech/native_client
 RUN rm -rf kenlm && \
 	git clone https://github.com/kpu/kenlm && \
 	cd kenlm && \
@@ -65,6 +63,6 @@ RUN rm -rf kenlm && \
 	cd build && \
 	cmake .. && \
 	make -j $(nproc)
-WORKDIR /STT
+WORKDIR /DeepSpeech
 
 RUN ./bin/run-ldc93s1.sh
diff --git a/setup.py b/setup.py
index 89e324cb..36b0b3a7 100644
--- a/setup.py
+++ b/setup.py
@@ -98,7 +98,7 @@ def main():
     setup(
         name='mozilla_voice_stt_training',
         version=version,
-        description='Training code for Mozilla Voice STT',
+        description='Training code for mozilla DeepSpeech',
         url='https://github.com/mozilla/STT',
         author='Mozilla',
         license='MPL-2.0',