Update TFX Docker to uninstall the version of TensorFlow installed by…

… the TFX components, and install the version requested. (#464) * Update TFX Docker to uninstall the version of TensorFlow installed by the TFX components, and install the version requested. * Also update the GitHub tag - the tags are now prefixed with a 'r', so e.g. version 0.21.2 has tag 'r0.21.2'. Co-authored-by: Chuan Yu Foo <[email protected]>
tensorflow · Apr 1, 2020 · 5d03cf8 · 5d03cf8
1 parent d0743d9
commit 5d03cf8
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/perfzero/docker/Dockerfile_ubuntu_1804_tfx b/perfzero/docker/Dockerfile_ubuntu_1804_tfx
@@ -81,7 +81,7 @@ RUN pip3 install --upgrade pip
 RUN pip install wheel
 RUN pip install --upgrade setuptools google-api-python-client pyyaml google-cloud google-cloud-bigquery mock
 RUN pip install absl-py
-RUN pip install --upgrade --force-reinstall ${tensorflow_pip_spec} ${extra_pip_specs}
+RUN if [ ! -z "${extra_pip_specs}" ]; then pip install --upgrade --force-reinstall ${extra_pip_specs}; fi
 RUN pip install tfds-nightly
 RUN pip install -U scikit-learn
 
@@ -128,9 +128,16 @@ RUN if [ ${use_github_version} = 1 ]; then \
       # tag in GitHub. \
       LATEST_TFX_VERSION=$(yolk -V tfx | head -n 1 | cut -d' ' -f 2-); \
       echo LATEST_TFX_VERSION=${LATEST_TFX_VERSION}; \
-      pip install -e git+https://github.com/tensorflow/tfx.git@${LATEST_TFX_VERSION}#egg=tfx; \
+      # Note that the GitHub tag has an 'r' prefix, so version 0.21.0 has \
+      # tag 'r0.21.2' \
+      pip install -e git+https://github.com/tensorflow/tfx.git@r${LATEST_TFX_VERSION}#egg=tfx; \
       pip install tensorflow-transform; \
       pip install tensorflow-model-analysis; \
     fi;
 
+# Uninstall the TensorFlow version that TFX / the TFX components installed, and
+# force install the version requested.
+RUN pip uninstall -y tensorflow
+RUN pip install --upgrade --force-reinstall ${tensorflow_pip_spec}
+
 RUN pip freeze