From 935efe81b7825521f85f25407b208b0bcf714105 Mon Sep 17 00:00:00 2001 From: alesapin Date: Thu, 18 Oct 2018 19:49:00 +0300 Subject: [PATCH] CLICKHOUSE-4056: Fix build params --- docker/packager/binary/Dockerfile | 1 + docker/packager/deb/Dockerfile | 1 + docker/packager/packager | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile index 6e6395e1b9d..2206bcc7e49 100644 --- a/docker/packager/binary/Dockerfile +++ b/docker/packager/binary/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update -y \ cmake \ ccache \ distcc \ + distcc-pump \ curl \ gcc-7 \ g++-7 \ diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile index b019d291080..08eeb3f3578 100644 --- a/docker/packager/deb/Dockerfile +++ b/docker/packager/deb/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update -y \ fakeroot \ ccache \ distcc \ + distcc-pump \ cmake \ curl \ gcc-7 \ diff --git a/docker/packager/packager b/docker/packager/packager index db12ed0077a..fed0c54fae5 100755 --- a/docker/packager/packager +++ b/docker/packager/packager @@ -70,7 +70,7 @@ def parse_env_variables(build_type, compiler, sanitizer, package_type, cache, di result.append("CCACHE_PREFIX={}".format(cache)) if distcc_hosts: - hosts_with_params = ["{}/24,lz4".format(host) for host in distcc_hosts] + ["localhost/`nproc`"] + hosts_with_params = ["{}/24,lzo".format(host) for host in distcc_hosts] + ["localhost/`nproc`"] result.append('DISTCC_HOSTS="{}"'.format(" ".join(hosts_with_params))) elif cache == "distcc": result.append('DISTCC_HOSTS="{}"'.format("localhost/`nproc`"))