Merge pull request #29875 from mpppk:fix_generated_docker_files_drift

PiperOrigin-RevId: 253647876
This commit is contained in:
TensorFlower Gardener 2019-06-17 13:32:15 -07:00
commit f8eb295646
16 changed files with 24 additions and 24 deletions

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
&& apt-get clean \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
&& apt-get clean \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} as base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
FROM ubuntu:${UBUNTU_VERSION} AS base

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm /usr/lib/${LIB_DIR_PREFIX}-linux-gnu/libcudnn_static_v7.a
RUN [[ "${ARCH}" = "ppc64le" ]] || { apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
libnvinfer5=5.0.2-1+cuda${CUDA} \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
&& apt-get clean \

View File

@ -19,7 +19,7 @@
# throughout. Please refer to the TensorFlow dockerfiles documentation
# for more information.
ARG UBUNTU_VERSION=16.04
ARG UBUNTU_VERSION=18.04
ARG ARCH=
ARG CUDA=10.0
@ -51,7 +51,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
unzip
RUN [ ${ARCH} = ppc64le ] || (apt-get update && \
apt-get install nvinfer-runtime-trt-repo-ubuntu1604-5.0.2-ga-cuda${CUDA} \
apt-get install nvinfer-runtime-trt-repo-ubuntu1804-5.0.2-ga-cuda${CUDA} \
&& apt-get update \
&& apt-get install -y --no-install-recommends libnvinfer5=5.0.2-1+cuda${CUDA} \
&& apt-get clean \