From 57c26827c0e0bee43d5dbcde1454090270f41a10 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Mon, 28 Sep 2020 10:23:00 +0200
Subject: [PATCH 1/2] Use correct 1.15.4 docker image

---
 Dockerfile.train.tmpl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Dockerfile.train.tmpl b/Dockerfile.train.tmpl
index 6d33cb25..9baa76d9 100644
--- a/Dockerfile.train.tmpl
+++ b/Dockerfile.train.tmpl
@@ -1,6 +1,6 @@
 # Please refer to the TRAINING documentation, "Basic Dockerfile for training"
 
-FROM tensorflow/tensorflow:1.15.2-gpu-py3
+FROM tensorflow/tensorflow:1.15.4-gpu-py3
 ENV DEBIAN_FRONTEND=noninteractive
 
 ENV DEEPSPEECH_REPO=#DEEPSPEECH_REPO#
@@ -43,9 +43,6 @@ RUN pip3 install --upgrade native_client/ctcdecode/dist/*.whl
 # Prepare deps
 RUN pip3 install --upgrade pip==20.2.2 wheel==0.34.2 setuptools==49.6.0
 
-# FIXME: Hack because no 1.15.4 Docker image
-RUN pip3 install --upgrade tensorflow-gpu==1.15.4
-
 # Install DeepSpeech
 #  - No need for the decoder since we did it earlier
 #  - There is already correct TensorFlow GPU installed on the base image,

From 02548c17de51f30d53b998af80c57d74c20263e8 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Mon, 28 Sep 2020 13:33:50 +0200
Subject: [PATCH 2/2] Fix #3347: Disable Git-LFS on Windows

---
 taskcluster/generic_tc_caching-win-opt-base.tyml | 1 +
 taskcluster/test-win-cuda-opt-base.tyml          | 1 +
 taskcluster/test-win-opt-base.tyml               | 1 +
 taskcluster/win-opt-base.tyml                    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/taskcluster/generic_tc_caching-win-opt-base.tyml b/taskcluster/generic_tc_caching-win-opt-base.tyml
index 133324f0..9334ba7a 100644
--- a/taskcluster/generic_tc_caching-win-opt-base.tyml
+++ b/taskcluster/generic_tc_caching-win-opt-base.tyml
@@ -24,6 +24,7 @@ payload:
   env:
     TC_MSYS_VERSION: 'MSYS_NT-6.3-9600'
     MSYS: 'winsymlinks:nativestrict'
+    GIT_LFS_SKIP_SMUDGE: '1'
 
   command:
     - >-
diff --git a/taskcluster/test-win-cuda-opt-base.tyml b/taskcluster/test-win-cuda-opt-base.tyml
index d8353d66..1813dced 100644
--- a/taskcluster/test-win-cuda-opt-base.tyml
+++ b/taskcluster/test-win-cuda-opt-base.tyml
@@ -31,6 +31,7 @@ then:
         EXPECTED_TENSORFLOW_VERSION: "${build.tensorflow_git_desc}"
         TC_MSYS_VERSION: 'MSYS_NT-6.3-9600'
         MSYS: 'winsymlinks:nativestrict'
+        GIT_LFS_SKIP_SMUDGE: '1'
 
     command:
       - >-
diff --git a/taskcluster/test-win-opt-base.tyml b/taskcluster/test-win-opt-base.tyml
index 55c1aa2e..9cfdfa43 100644
--- a/taskcluster/test-win-opt-base.tyml
+++ b/taskcluster/test-win-opt-base.tyml
@@ -33,6 +33,7 @@ then:
         EXPECTED_TENSORFLOW_VERSION: "${build.tensorflow_git_desc}"
         TC_MSYS_VERSION: 'MSYS_NT-6.3-9600'
         MSYS: 'winsymlinks:nativestrict'
+        GIT_LFS_SKIP_SMUDGE: '1'
 
     command:
       - >-
diff --git a/taskcluster/win-opt-base.tyml b/taskcluster/win-opt-base.tyml
index 385616dc..9d0a01c8 100644
--- a/taskcluster/win-opt-base.tyml
+++ b/taskcluster/win-opt-base.tyml
@@ -32,6 +32,7 @@ payload:
   env:
     TC_MSYS_VERSION: 'MSYS_NT-6.3-9600'
     MSYS: 'winsymlinks:nativestrict'
+    GIT_LFS_SKIP_SMUDGE: '1'
     EXAMPLES_CLONE_URL: "https://github.com/mozilla/DeepSpeech-examples"
     EXAMPLES_CHECKOUT_TARGET: "master"