From 1689e1fe22bf52140f0500a048a03136a466757e Mon Sep 17 00:00:00 2001 From: Luciano Resende Date: Wed, 4 Sep 2019 19:49:18 +0100 Subject: [PATCH] Make curl available on all tensorflow docker images While working on some Kubeflow Pipelines automation we noticed the gpu based tf images had curl installed while the non-gpu didn't which was causing some issues. This consistently make curl available on all images. --- .../tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile | 2 ++ tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile | 2 ++ .../dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile | 4 +++- .../dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile | 4 +++- .../dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile | 2 +- .../dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile | 2 +- .../partials/tensorflow-ppc64le.partial.Dockerfile | 2 +- .../tools/dockerfiles/partials/ubuntu/cpu.partial.Dockerfile | 2 ++ 8 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile index 2e8d43843c5..46443bb6946 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/cpu-jupyter.Dockerfile @@ -23,6 +23,8 @@ ARG UBUNTU_VERSION=18.04 FROM ubuntu:${UBUNTU_VERSION} as base +RUN apt-get update && apt-get install -y curl + ARG USE_PYTHON_3_NOT_2 ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3} ARG PYTHON=python${_PY_SUFFIX} diff --git a/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile index a0bda2e72af..bf1d51894d7 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/cpu.Dockerfile @@ -23,6 +23,8 @@ ARG UBUNTU_VERSION=18.04 FROM ubuntu:${UBUNTU_VERSION} as base +RUN apt-get update && apt-get install -y curl + ARG USE_PYTHON_3_NOT_2 ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3} ARG PYTHON=python${_PY_SUFFIX} diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile index cd78aa57e22..907d6af7b3c 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le-jupyter.Dockerfile @@ -23,6 +23,8 @@ ARG UBUNTU_VERSION=18.04 FROM ubuntu:${UBUNTU_VERSION} as base +RUN apt-get update && apt-get install -y curl + ARG USE_PYTHON_3_NOT_2 ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3} ARG PYTHON=python${_PY_SUFFIX} @@ -48,7 +50,7 @@ RUN ln -s $(which ${PYTHON}) /usr/local/bin/python # tf-nightly # tf-nightly-gpu ARG TF_PACKAGE=tensorflow -RUN apt-get update && apt-get install -y wget libhdf5-dev +RUN apt-get update && apt-get install -y curl libhdf5-dev wget RUN ${PIP} install --global-option=build_ext \ --global-option=-I/usr/include/hdf5/serial/ \ --global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile index 22016c245ee..3ec3f3a6486 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/cpu-ppc64le.Dockerfile @@ -23,6 +23,8 @@ ARG UBUNTU_VERSION=18.04 FROM ubuntu:${UBUNTU_VERSION} as base +RUN apt-get update && apt-get install -y curl + ARG USE_PYTHON_3_NOT_2 ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3} ARG PYTHON=python${_PY_SUFFIX} @@ -48,7 +50,7 @@ RUN ln -s $(which ${PYTHON}) /usr/local/bin/python # tf-nightly # tf-nightly-gpu ARG TF_PACKAGE=tensorflow -RUN apt-get update && apt-get install -y wget libhdf5-dev +RUN apt-get update && apt-get install -y curl libhdf5-dev wget RUN ${PIP} install --global-option=build_ext \ --global-option=-I/usr/include/hdf5/serial/ \ --global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile index 7ebfcedbf85..71a1b79a3db 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le-jupyter.Dockerfile @@ -89,7 +89,7 @@ RUN ln -s $(which ${PYTHON}) /usr/local/bin/python # tf-nightly # tf-nightly-gpu ARG TF_PACKAGE=tensorflow -RUN apt-get update && apt-get install -y wget libhdf5-dev +RUN apt-get update && apt-get install -y curl libhdf5-dev wget RUN ${PIP} install --global-option=build_ext \ --global-option=-I/usr/include/hdf5/serial/ \ --global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \ diff --git a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile index 0b511bb1817..4655b1d5509 100644 --- a/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile +++ b/tensorflow/tools/dockerfiles/dockerfiles/ppc64le/gpu-ppc64le.Dockerfile @@ -89,7 +89,7 @@ RUN ln -s $(which ${PYTHON}) /usr/local/bin/python # tf-nightly # tf-nightly-gpu ARG TF_PACKAGE=tensorflow -RUN apt-get update && apt-get install -y wget libhdf5-dev +RUN apt-get update && apt-get install -y curl libhdf5-dev wget RUN ${PIP} install --global-option=build_ext \ --global-option=-I/usr/include/hdf5/serial/ \ --global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \ diff --git a/tensorflow/tools/dockerfiles/partials/tensorflow-ppc64le.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/tensorflow-ppc64le.partial.Dockerfile index 1e79574a34d..fbeb7f994ff 100644 --- a/tensorflow/tools/dockerfiles/partials/tensorflow-ppc64le.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/tensorflow-ppc64le.partial.Dockerfile @@ -4,7 +4,7 @@ # tf-nightly # tf-nightly-gpu ARG TF_PACKAGE=tensorflow -RUN apt-get update && apt-get install -y wget libhdf5-dev +RUN apt-get update && apt-get install -y curl libhdf5-dev wget RUN ${PIP} install --global-option=build_ext \ --global-option=-I/usr/include/hdf5/serial/ \ --global-option=-L/usr/lib/powerpc64le-linux-gnu/hdf5/serial \ diff --git a/tensorflow/tools/dockerfiles/partials/ubuntu/cpu.partial.Dockerfile b/tensorflow/tools/dockerfiles/partials/ubuntu/cpu.partial.Dockerfile index d01b26e27f6..db44fe95772 100644 --- a/tensorflow/tools/dockerfiles/partials/ubuntu/cpu.partial.Dockerfile +++ b/tensorflow/tools/dockerfiles/partials/ubuntu/cpu.partial.Dockerfile @@ -1 +1,3 @@ FROM ubuntu:${UBUNTU_VERSION} as base + +RUN apt-get update && apt-get install -y curl