diff options
| author | Ilya Biryukov <ibiryukov@google.com> | 2018-04-20 10:19:38 +0000 |
|---|---|---|
| committer | Ilya Biryukov <ibiryukov@google.com> | 2018-04-20 10:19:38 +0000 |
| commit | 2bf7c51d0e580456f256e2cd7932bb197d1ecd32 (patch) | |
| tree | de1c3d1d2ec05b796d25d416076813cd4faf2f82 /llvm/utils/docker/debian8 | |
| parent | d4332eb3b792f614d77d4e2a07e71a8cb42267a2 (diff) | |
| download | bcm5719-llvm-2bf7c51d0e580456f256e2cd7932bb197d1ecd32.tar.gz bcm5719-llvm-2bf7c51d0e580456f256e2cd7932bb197d1ecd32.zip | |
[Dockerfiles] Split checkout and build scripts into separate files.
Summary:
This is a small refactoring to extract the svn checkout code from the
build script used inside the docker image.
This would give more flexibility if more than a single invocation of
cmake is needed inside the docker image.
User-facing interface (build_docker_image.sh) hasn't changed, only the
internal scripts running inside the build container are affected.
Reviewers: ioeric
Reviewed By: ioeric
Subscribers: mehdi_amini, llvm-commits
Differential Revision: https://reviews.llvm.org/D45868
llvm-svn: 330412
Diffstat (limited to 'llvm/utils/docker/debian8')
| -rw-r--r-- | llvm/utils/docker/debian8/Dockerfile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/llvm/utils/docker/debian8/Dockerfile b/llvm/utils/docker/debian8/Dockerfile index fd3bf9f49f0..fe12ec55e52 100644 --- a/llvm/utils/docker/debian8/Dockerfile +++ b/llvm/utils/docker/debian8/Dockerfile @@ -41,10 +41,13 @@ RUN mkdir /tmp/cmake-install && cd /tmp/cmake-install && \ ADD checksums /tmp/checksums ADD scripts /tmp/scripts -# Arguments passed to build_install_clang.sh. -ARG buildscript_args + +# Checkout the source code. +ARG checkout_args +RUN /tmp/scripts/checkout.sh ${checkout_args} # Run the build. Results of the build will be available at /tmp/clang-install/. -RUN /tmp/scripts/build_install_llvm.sh ${buildscript_args} +ARG buildscript_args +RUN /tmp/scripts/build_install_llvm.sh --to /tmp/clang-install ${buildscript_args} # Stage 2. Produce a minimal release image with build results. |
