aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Yong Tang <yong.tang.github@outlook.com>2018-03-07 23:22:17 -0800
committerGravatar Gunhan Gulsoy <gunan@google.com>2018-03-07 23:22:17 -0800
commitf9fb7e7736423f0bd416e1949e614d302c929709 (patch)
tree92b1cf2a73e02eda38352d650952050796c81fef
parentcf3603919b16e7974087345dc5bc53c9e0edf214 (diff)
Fix cmake Dockerfile issue on Linux (#17416)
* Fix cmake Dockerfile issue on Linux When running cmake on Linux with (clean build with no cached docker images): ``` tensorflow/tools/ci_build/ci_build.sh CMAKE tensorflow/tools/ci_build/builds/cmake.sh ``` The following isse was encountered: ``` Step 11/13 : RUN pip install --upgrade termcolor ---> Running in 838167596eb6 Collecting termcolor Downloading termcolor-1.1.0.tar.gz ...... ...... ...... error: invalid command 'bdist_wheel' ---------------------------------------- Failed building wheel for termcolor ``` This fix adds the missing `pip install wheel` Signed-off-by: Yong Tang <yong.tang.github@outlook.com> * Update golang installation in cmake Dockerfile This fix updates the golang installation in cmake Dockerfile. Previously, `ppa:ubuntu-lxc/lxd-stable` was used but it has been deprecated, see: http://lxc-users.linuxcontainers.narkive.com/IlHLLHqN/lxd-official-ppa-deprecation That caused the following error: ``` Step 13/14 : RUN add-apt-repository -y ppa:ubuntu-lxc/lxd-stable ---> Running in 09301ba43a33 Cannot add PPA: 'ppa:~ubuntu-lxc/ubuntu/lxd-stable'. The team named '~ubuntu-lxc' has no PPA named 'ubuntu/lxd-stable' Please choose from the following available PPAs: * 'buildd-backports': linuxcontainers.org: buildd backports * 'daily': linuxcontainers.org: development builds ...... ...... ``` This fix updates the golang installation and use backported xenial (16.04), as was suggested in the link: http://lxc-users.linuxcontainers.narkive.com/IlHLLHqN/lxd-official-ppa-deprecation Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
-rw-r--r--tensorflow/tools/ci_build/Dockerfile.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/tools/ci_build/Dockerfile.cmake b/tensorflow/tools/ci_build/Dockerfile.cmake
index ec90c83aac..d5dea4f3e4 100644
--- a/tensorflow/tools/ci_build/Dockerfile.cmake
+++ b/tensorflow/tools/ci_build/Dockerfile.cmake
@@ -23,11 +23,12 @@ RUN /install/install_deb_packages.sh
RUN apt-get update
RUN apt-get install -y --no-install-recommends python-pip
+RUN pip install --upgrade wheel
RUN pip install --upgrade astor
RUN pip install --upgrade gast
RUN pip install --upgrade numpy
RUN pip install --upgrade termcolor
# Install golang
-RUN add-apt-repository -y ppa:ubuntu-lxc/lxd-stable
-RUN apt-get install -y golang
+RUN apt-get install -t xenial-backports -y golang-1.9
+ENV PATH=${PATH}:/usr/lib/go-1.9/bin