From 2f024ba52767755fae475374f14d8a60169c8d12 Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Mon, 5 Dec 2016 16:35:37 -0800 Subject: [PATCH] Add more customizable ARGs with default values to Dockerfiles . --- paddle/scripts/docker/Dockerfile | 13 ++++++++++--- paddle/scripts/docker/Dockerfile.gpu | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/paddle/scripts/docker/Dockerfile b/paddle/scripts/docker/Dockerfile index be077dfc00..e6065aee80 100644 --- a/paddle/scripts/docker/Dockerfile +++ b/paddle/scripts/docker/Dockerfile @@ -8,12 +8,19 @@ RUN apt-get update && \ wget unzip python-matplotlib tar xz-utils bzip2 gzip coreutils \ sed grep graphviz libjpeg-dev zlib1g-dev doxygen && \ apt-get clean -y -RUN pip install BeautifulSoup docopt PyYAML pillow \ - 'sphinx>=1.4.0' sphinx_rtd_theme breathe recommonmark +RUN pip install -U BeautifulSoup docopt PyYAML pillow \ + sphinx sphinx_rtd_theme breathe recommonmark ARG WITH_AVX -ENV WITH_AVX=${WITH_AVX:-ON} +ARG WITH_DOC +ARG WITH_SWIG_PY +ARG WITH_STYLE_CHECK + ENV WITH_GPU=OFF +ENV WITH_AVX=${WITH_AVX:-ON} +ENV WITH_DOC=${WITH_DOC:-ON} +ENV WITH_SWIG_PY=${WITH_SWIG_PY:-ON} +ENV WITH_STYLE_CHECK=${WITH_STYLE_CHECK:-OFF} RUN mkdir /paddle COPY . /paddle/ diff --git a/paddle/scripts/docker/Dockerfile.gpu b/paddle/scripts/docker/Dockerfile.gpu index 292b4dc66b..af4cdb7e5c 100644 --- a/paddle/scripts/docker/Dockerfile.gpu +++ b/paddle/scripts/docker/Dockerfile.gpu @@ -8,12 +8,19 @@ RUN apt-get update && \ wget unzip python-matplotlib tar xz-utils bzip2 gzip coreutils \ sed grep graphviz libjpeg-dev zlib1g-dev doxygen && \ apt-get clean -y -RUN pip install BeautifulSoup docopt PyYAML pillow \ - 'sphinx>=1.4.0' sphinx_rtd_theme breathe recommonmark +RUN pip install -U BeautifulSoup docopt PyYAML pillow \ + sphinx sphinx_rtd_theme breathe recommonmark ARG WITH_AVX -ENV WITH_AVX=${WITH_AVX:-ON} +ARG WITH_DOC +ARG WITH_SWIG_PY +ARG WITH_STYLE_CHECK + ENV WITH_GPU=ON +ENV WITH_AVX=${WITH_AVX:-ON} +ENV WITH_DOC=${WITH_DOC:-ON} +ENV WITH_SWIG_PY=${WITH_SWIG_PY:-ON} +ENV WITH_STYLE_CHECK=${WITH_STYLE_CHECK:-OFF} RUN mkdir /paddle COPY . /paddle/ -- GitLab