Remove -py3 docker images entirely
This completes the plan announced in https://groups.google.com/a/tensorflow.org/d/msg/developers/5ZZG7M5E6FQ/zKv6uFn1EgAJ, removing all Python 2 considerations from our Dockerfiles. There are no longer any -py3 tags, as all the images are running Python 3. Resolves #36971 and #37422. We're not able to dedicate the time to maintaining multiple versions of Python 3 at this time, unfortunately. PiperOrigin-RevId: 304650599 Change-Id: Ib2b21e809f242fe914fb407381d8eaaa20f2ef99
This commit is contained in:
Austin Anderson
TensorFlower Gardener
parent
7f09d08f5d
commit
9f7793af0b
|
|
@ -25,25 +25,19 @@ FROM ubuntu:${UBUNTU_VERSION} as base
|
|||
|
||||
RUN apt-get update && apt-get install -y curl
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
@ -59,10 +53,9 @@ RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACK
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -82,6 +75,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -25,25 +25,19 @@ FROM ubuntu:${UBUNTU_VERSION} as base
|
|||
|
||||
RUN apt-get update && apt-get install -y curl
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
|
|||
|
|
@ -54,25 +54,19 @@ ARG CHECKOUT_TF_SRC=0
|
|||
RUN chmod a+w /etc/passwd /etc/group
|
||||
RUN test "${CHECKOUT_TF_SRC}" -eq 1 && git clone https://github.com/tensorflow/tensorflow.git /tensorflow_src || true
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
|
|
@ -80,7 +74,7 @@ RUN apt-get update && apt-get install -y \
|
|||
git \
|
||||
wget \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -96,7 +90,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
pandas \
|
||||
future \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Install bazel
|
||||
|
|
@ -111,10 +104,9 @@ RUN mkdir /bazel && \
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -134,6 +126,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -54,25 +54,19 @@ ARG CHECKOUT_TF_SRC=0
|
|||
RUN chmod a+w /etc/passwd /etc/group
|
||||
RUN test "${CHECKOUT_TF_SRC}" -eq 1 && git clone https://github.com/tensorflow/tensorflow.git /tensorflow_src || true
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
|
|
@ -80,7 +74,7 @@ RUN apt-get update && apt-get install -y \
|
|||
git \
|
||||
wget \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -96,7 +90,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
pandas \
|
||||
future \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Install bazel
|
||||
|
|
|
|||
|
|
@ -96,25 +96,19 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
|
|
@ -122,7 +116,7 @@ RUN apt-get update && apt-get install -y \
|
|||
git \
|
||||
wget \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -138,7 +132,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
pandas \
|
||||
future \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Install bazel
|
||||
|
|
@ -153,10 +146,9 @@ RUN mkdir /bazel && \
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -176,6 +168,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -96,25 +96,19 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
|
|
@ -122,7 +116,7 @@ RUN apt-get update && apt-get install -y \
|
|||
git \
|
||||
wget \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -138,7 +132,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
pandas \
|
||||
future \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Install bazel
|
||||
|
|
|
|||
|
|
@ -74,25 +74,19 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
@ -108,10 +102,9 @@ RUN ${PIP} install --no-cache-dir ${TF_PACKAGE}${TF_PACKAGE_VERSION:+==${TF_PACK
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -131,6 +124,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -74,25 +74,19 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
|
|||
|
|
@ -54,25 +54,19 @@ ARG CHECKOUT_TF_SRC=0
|
|||
RUN chmod a+w /etc/passwd /etc/group
|
||||
RUN test "${CHECKOUT_TF_SRC}" -eq 1 && git clone https://github.com/tensorflow/tensorflow.git /tensorflow_src || true
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
|
|
@ -80,7 +74,7 @@ RUN apt-get update && apt-get install -y \
|
|||
git \
|
||||
wget \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -96,11 +90,10 @@ RUN ${PIP} --no-cache-dir install \
|
|||
pandas \
|
||||
future \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Install bazel
|
||||
ARG BAZEL_VERSION=1.2.1
|
||||
ARG BAZEL_VERSION=2.0.0
|
||||
RUN mkdir /bazel && \
|
||||
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
|
||||
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
|
||||
|
|
@ -163,10 +156,9 @@ RUN test "${CHECKOUT_HOROVOD_SRC}" -eq 1 && git clone --recursive https://github
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -186,6 +178,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -54,25 +54,19 @@ ARG CHECKOUT_TF_SRC=0
|
|||
RUN chmod a+w /etc/passwd /etc/group
|
||||
RUN test "${CHECKOUT_TF_SRC}" -eq 1 && git clone https://github.com/tensorflow/tensorflow.git /tensorflow_src || true
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
|
|
@ -80,7 +74,7 @@ RUN apt-get update && apt-get install -y \
|
|||
git \
|
||||
wget \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -96,11 +90,10 @@ RUN ${PIP} --no-cache-dir install \
|
|||
pandas \
|
||||
future \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Install bazel
|
||||
ARG BAZEL_VERSION=1.2.1
|
||||
ARG BAZEL_VERSION=2.0.0
|
||||
RUN mkdir /bazel && \
|
||||
wget -O /bazel/installer.sh "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh" && \
|
||||
wget -O /bazel/LICENSE.txt "https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE" && \
|
||||
|
|
|
|||
|
|
@ -25,25 +25,19 @@ FROM ubuntu:${UBUNTU_VERSION} as base
|
|||
|
||||
RUN apt-get update && apt-get install -y curl
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
@ -111,10 +105,9 @@ RUN ${PIP} install --no-cache-dir horovod==${HOROVOD_VERSION}
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -134,6 +127,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -25,25 +25,19 @@ FROM ubuntu:${UBUNTU_VERSION} as base
|
|||
|
||||
RUN apt-get update && apt-get install -y curl
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
|
|||
|
|
@ -25,25 +25,19 @@ FROM ubuntu:${UBUNTU_VERSION} as base
|
|||
|
||||
RUN apt-get update && apt-get install -y curl
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
@ -68,8 +62,8 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
|
|||
elif [ ${TF_PACKAGE} = tf-nightly ]; then \
|
||||
BASE=https://powerci.osuosl.org/job/TensorFlow_PPC64LE_CPU_Nightly_Artifact/lastSuccessfulBuild/; \
|
||||
fi; \
|
||||
MAJOR=`${PYTHON} -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`${PYTHON} -c 'import sys; print(sys.version_info[1])'`; \
|
||||
MAJOR=`python3 -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
|
||||
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
|
||||
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
|
||||
${PIP} install ${PACKAGE}
|
||||
|
|
@ -77,10 +71,9 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -100,6 +93,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -25,25 +25,19 @@ FROM ubuntu:${UBUNTU_VERSION} as base
|
|||
|
||||
RUN apt-get update && apt-get install -y curl
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
@ -68,8 +62,8 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
|
|||
elif [ ${TF_PACKAGE} = tf-nightly ]; then \
|
||||
BASE=https://powerci.osuosl.org/job/TensorFlow_PPC64LE_CPU_Nightly_Artifact/lastSuccessfulBuild/; \
|
||||
fi; \
|
||||
MAJOR=`${PYTHON} -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`${PYTHON} -c 'import sys; print(sys.version_info[1])'`; \
|
||||
MAJOR=`python3 -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
|
||||
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
|
||||
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
|
||||
${PIP} install ${PACKAGE}
|
||||
|
|
|
|||
|
|
@ -54,32 +54,26 @@ ARG CHECKOUT_TF_SRC=0
|
|||
RUN chmod a+w /etc/passwd /etc/group
|
||||
RUN test "${CHECKOUT_TF_SRC}" -eq 1 && git clone https://github.com/tensorflow/tensorflow.git /tensorflow_src || true
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
curl \
|
||||
git \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -94,7 +88,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
sklearn \
|
||||
pandas \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Build and install bazel
|
||||
|
|
@ -112,10 +105,9 @@ RUN mkdir /bazel && \
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -135,6 +127,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -54,32 +54,26 @@ ARG CHECKOUT_TF_SRC=0
|
|||
RUN chmod a+w /etc/passwd /etc/group
|
||||
RUN test "${CHECKOUT_TF_SRC}" -eq 1 && git clone https://github.com/tensorflow/tensorflow.git /tensorflow_src || true
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
curl \
|
||||
git \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -94,7 +88,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
sklearn \
|
||||
pandas \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Build and install bazel
|
||||
|
|
|
|||
|
|
@ -96,32 +96,26 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
curl \
|
||||
git \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -136,7 +130,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
sklearn \
|
||||
pandas \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Build and install bazel
|
||||
|
|
@ -154,10 +147,9 @@ RUN mkdir /bazel && \
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -177,6 +169,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -96,32 +96,26 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
build-essential \
|
||||
curl \
|
||||
git \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -136,7 +130,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
sklearn \
|
||||
pandas \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Build and install bazel
|
||||
|
|
|
|||
|
|
@ -74,25 +74,19 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
@ -117,8 +111,8 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
|
|||
elif [ ${TF_PACKAGE} = tf-nightly ]; then \
|
||||
BASE=https://powerci.osuosl.org/job/TensorFlow_PPC64LE_CPU_Nightly_Artifact/lastSuccessfulBuild/; \
|
||||
fi; \
|
||||
MAJOR=`${PYTHON} -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`${PYTHON} -c 'import sys; print(sys.version_info[1])'`; \
|
||||
MAJOR=`python3 -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
|
||||
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
|
||||
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
|
||||
${PIP} install ${PACKAGE}
|
||||
|
|
@ -126,10 +120,9 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
|
|||
COPY bashrc /etc/bash.bashrc
|
||||
RUN chmod a+rwx /etc/bash.bashrc
|
||||
|
||||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -149,6 +142,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -74,25 +74,19 @@ RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/lib
|
|||
&& echo "/usr/local/cuda/lib64/stubs" > /etc/ld.so.conf.d/z-cuda-stubs.conf \
|
||||
&& ldconfig
|
||||
|
||||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
||||
# Options:
|
||||
# tensorflow
|
||||
|
|
@ -117,8 +111,8 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
|
|||
elif [ ${TF_PACKAGE} = tf-nightly ]; then \
|
||||
BASE=https://powerci.osuosl.org/job/TensorFlow_PPC64LE_CPU_Nightly_Artifact/lastSuccessfulBuild/; \
|
||||
fi; \
|
||||
MAJOR=`${PYTHON} -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`${PYTHON} -c 'import sys; print(sys.version_info[1])'`; \
|
||||
MAJOR=`python3 -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
|
||||
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
|
||||
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
|
||||
${PIP} install ${PACKAGE}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
RUN ${PIP} install jupyter matplotlib
|
||||
RUN python3 -m pip install jupyter matplotlib
|
||||
# Pin ipykernel and nbformat; see https://github.com/ipython/ipykernel/issues/422
|
||||
RUN if [[ "${USE_PYTHON_3_NOT_2}" == "1" ]]; then ${PIP} install ipykernel==5.1.1 nbformat==4.4.0; fi
|
||||
RUN ${PIP} install jupyter_http_over_ws
|
||||
RUN python3 -m pip install jupyter_http_over_ws ipykernel==5.1.1 nbformat==4.4.0
|
||||
RUN jupyter serverextension enable --py jupyter_http_over_ws
|
||||
|
||||
RUN mkdir -p /tf/tensorflow-tutorials && chmod -R a+rwx /tf/
|
||||
|
|
@ -21,6 +20,6 @@ RUN apt-get autoremove -y && apt-get remove -y wget
|
|||
WORKDIR /tf
|
||||
EXPOSE 8888
|
||||
|
||||
RUN ${PYTHON} -m ipykernel.kernelspec
|
||||
RUN python3 -m ipykernel.kernelspec
|
||||
|
||||
CMD ["bash", "-c", "source /etc/bash.bashrc && jupyter notebook --notebook-dir=/tf --ip 0.0.0.0 --no-browser --allow-root"]
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@ RUN if [ ${TF_PACKAGE} = tensorflow-gpu ]; then \
|
|||
elif [ ${TF_PACKAGE} = tf-nightly ]; then \
|
||||
BASE=https://powerci.osuosl.org/job/TensorFlow_PPC64LE_CPU_Nightly_Artifact/lastSuccessfulBuild/; \
|
||||
fi; \
|
||||
MAJOR=`${PYTHON} -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`${PYTHON} -c 'import sys; print(sys.version_info[1])'`; \
|
||||
MAJOR=`python3 -c 'import sys; print(sys.version_info[0])'`; \
|
||||
MINOR=`python3 -c 'import sys; print(sys.version_info[1])'`; \
|
||||
PACKAGE=$(wget -qO- ${BASE}"api/xml?xpath=//fileName&wrapper=artifacts" | grep -o "[^<>]*cp${MAJOR}${MINOR}[^<>]*.whl"); \
|
||||
wget ${BASE}"artifact/tensorflow_pkg/"${PACKAGE}; \
|
||||
${PIP} install ${PACKAGE}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y \
|
|||
git \
|
||||
wget \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -20,7 +20,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
pandas \
|
||||
future \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Install bazel
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ RUN apt-get update && apt-get install -y \
|
|||
curl \
|
||||
git \
|
||||
openjdk-8-jdk \
|
||||
${PYTHON}-dev \
|
||||
python3-dev \
|
||||
virtualenv \
|
||||
swig
|
||||
|
||||
|
|
@ -18,7 +18,6 @@ RUN ${PIP} --no-cache-dir install \
|
|||
sklearn \
|
||||
pandas \
|
||||
portpicker \
|
||||
&& test "${USE_PYTHON_3_NOT_2}" -eq 1 && true || ${PIP} --no-cache-dir install \
|
||||
enum34
|
||||
|
||||
# Build and install bazel
|
||||
|
|
|
|||
|
|
@ -1,19 +1,13 @@
|
|||
ARG USE_PYTHON_3_NOT_2
|
||||
# TODO(angerson) Completely remove Python 2 support
|
||||
ARG _PY_SUFFIX=${USE_PYTHON_3_NOT_2:+3}
|
||||
ARG PYTHON=python${_PY_SUFFIX}
|
||||
ARG PIP=pip${_PY_SUFFIX}
|
||||
|
||||
# See http://bugs.python.org/issue19846
|
||||
ENV LANG C.UTF-8
|
||||
|
||||
RUN apt-get update && apt-get install -y \
|
||||
${PYTHON} \
|
||||
${PYTHON}-pip
|
||||
python3
|
||||
python3-pip
|
||||
|
||||
RUN ${PIP} --no-cache-dir install --upgrade \
|
||||
RUN python3 -m pip --no-cache-dir install --upgrade \
|
||||
pip \
|
||||
setuptools
|
||||
|
||||
# Some TF tools expect a "python" binary
|
||||
RUN ln -s $(which ${PYTHON}) /usr/local/bin/python
|
||||
RUN ln -s $(which python3) /usr/local/bin/python
|
||||
|
|
|
|||
|
|
@ -25,28 +25,19 @@ header: |
|
|||
# of functionality ("slices") by listing all of the "slice sets" to use when
|
||||
# building.
|
||||
#
|
||||
# For example, a release that uses {nightly}{py} would create 4 Dockerfiles
|
||||
# (which could become images or concrete Dockerfiles), because the "nightly"
|
||||
# and "py" slice sets both have two entries:
|
||||
#
|
||||
# - nightly (no -py2 because the Python 2 slice set has add_to_name: ""
|
||||
# - nightly-py3
|
||||
# - nightly-gpu (similar)
|
||||
# - nightly-gpu-py3
|
||||
#
|
||||
# Releases are all treated differently by TensorFlow's CI systems.
|
||||
releases:
|
||||
# Built Nightly and pushed to tensorflow/tensorflow
|
||||
nightly:
|
||||
tag_specs:
|
||||
- "{nightly}{py}{jupyter}"
|
||||
- "{_TAG_PREFIX}{ubuntu-devel}{py-devel}"
|
||||
- "{nightly}{jupyter}"
|
||||
- "{_TAG_PREFIX}{ubuntu-devel}"
|
||||
|
||||
# Built per-release and pushed to tensorflow/tensorflow
|
||||
# --arg _TAG_PREFIX=<val> should be set to "1.11" (for example) or "latest".
|
||||
versioned:
|
||||
tag_specs:
|
||||
- "{_TAG_PREFIX}{ubuntu}{py}{jupyter}"
|
||||
- "{_TAG_PREFIX}{ubuntu}{jupyter}"
|
||||
|
||||
# Dockerfiles stored in the TF repo; not pushed anywhere
|
||||
dockerfiles:
|
||||
|
|
@ -62,22 +53,6 @@ releases:
|
|||
|
||||
slice_sets:
|
||||
|
||||
py:
|
||||
- add_to_name: ""
|
||||
args:
|
||||
- USE_PYTHON_3_NOT_2=1
|
||||
- add_to_name: "-py3"
|
||||
args:
|
||||
- USE_PYTHON_3_NOT_2=1
|
||||
|
||||
py-devel:
|
||||
- add_to_name: ""
|
||||
args:
|
||||
- USE_PYTHON_3_NOT_2=1
|
||||
- add_to_name: "-py3"
|
||||
args:
|
||||
- USE_PYTHON_3_NOT_2=1
|
||||
|
||||
jupyter:
|
||||
- add_to_name: ""
|
||||
- add_to_name: "-jupyter"
|
||||
|
|
|
|||
Loading…
Reference in New Issue