You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kudu.apache.org by gr...@apache.org on 2020/04/06 22:54:44 UTC
[kudu] 02/02: [docker] Fix the docker thirdparty build
This is an automated email from the ASF dual-hosted git repository.
granthenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 53fb9459599fa55cbc095fd37202e93e1f279018
Author: Grant Henke <gr...@apache.org>
AuthorDate: Mon Apr 6 12:19:23 2020 -0500
[docker] Fix the docker thirdparty build
After 458e6ce, the docker thirdparty build was failing because
`/build-support/ccache-clang` was not available in the thirdparty image.
I tested this fix by running builds based on ubuntu:xenial, centos:6,
and centos:7 base images.
Change-Id: If25d7b07db4cc20de53b70fe0ab097be6f3756ed
Reviewed-on: http://gerrit.cloudera.org:8080/15659
Tested-by: Kudu Jenkins
Reviewed-by: Andrew Wong <aw...@cloudera.com>
---
docker/Dockerfile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6f2eadf..6afcc0d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -105,6 +105,8 @@ COPY ./thirdparty thirdparty
COPY ./build-support/enable_devtoolset.sh \
./build-support/enable_devtoolset_inner.sh \
build-support/
+COPY ./build-support/ccache-clang build-support/ccache-clang
+COPY ./build-support/ccache-devtoolset-3 build-support/ccache-devtoolset-3
RUN build-support/enable_devtoolset.sh \
thirdparty/build-if-necessary.sh \
# Remove the files left behind that we don't need.