summaryrefslogtreecommitdiff
path: root/utils/docker/example
diff options
context:
space:
mode:
authorIlya Biryukov <ibiryukov@google.com>2018-04-20 10:19:38 +0000
committerIlya Biryukov <ibiryukov@google.com>2018-04-20 10:19:38 +0000
commit50f681d03093c5c89c238ff16992ba05debeff35 (patch)
treeb01832aa8e68d27e986475efbc27642af799f390 /utils/docker/example
parenta2fbfc91ac4614be0852b6325ff6fd0935d100bf (diff)
[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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@330412 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/docker/example')
-rw-r--r--utils/docker/example/Dockerfile9
1 files changed, 6 insertions, 3 deletions
diff --git a/utils/docker/example/Dockerfile b/utils/docker/example/Dockerfile
index bb42a4df6bf..d875ed96d90 100644
--- a/utils/docker/example/Dockerfile
+++ b/utils/docker/example/Dockerfile
@@ -19,10 +19,13 @@ LABEL maintainer "Maintainer <maintainer@email>"
ADD checksums /tmp/checksums
ADD scripts /tmp/scripts
-# Arguments passed to build_install_clang.sh.
+
+# 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/.
ARG buildscript_args
-# Run the build. Results of the build will be available as /tmp/clang-install.
-RUN /tmp/scripts/build_install_llvm.sh ${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.