diff options
author | Vratko Polak <vrpolak@cisco.com> | 2021-04-23 09:04:12 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2021-04-23 09:04:12 +0000 |
commit | 8b096b06ec27886b0d4fb7e48073474d79afb9e2 (patch) | |
tree | 10e6ee91529a0c8348edd5db612b6c1b71f9f152 /docker | |
parent | 07afa5e16b729b4a8e03b2e35cfee168c2c5dd76 (diff) | |
parent | 8702a6af537154bf10a38a874c0e93eed0fb5f32 (diff) |
Merge "Refactor ccache config to use per-os ccache dirs."
Diffstat (limited to 'docker')
-rw-r--r-- | docker/scripts/lib_apt.sh | 3 | ||||
-rw-r--r-- | docker/scripts/lib_dnf.sh | 3 | ||||
-rw-r--r-- | docker/scripts/lib_yum.sh | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index a2e5c98a..725aedcc 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -221,7 +221,7 @@ generate_apt_dockerfile_clean() { # Clean up copy-in build tree RUN dbld_dump_build_logs.sh \\ - && rm -rf "/tmp/*" "$DOCKER_BUILD_FILES_DIR" + && rm -rf "/tmp/*" "$DOCKER_BUILD_FILES_DIR" "/root/.ccache" EOF } @@ -260,6 +260,7 @@ WORKDIR / $vpp_install_skip_sysctl_envvar ENV VPP_ZOMBIE_NOCHECK="1" ENV CCACHE_DIR="/scratch/ccache" +ENV CCACHE_MAXSIZE="10G" EOF generate_apt_dockerfile_clean } diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh index 34bc40c7..45204210 100644 --- a/docker/scripts/lib_dnf.sh +++ b/docker/scripts/lib_dnf.sh @@ -38,7 +38,7 @@ generate_dnf_dockerfile_clean() { # Clean up RUN dbld_dump_build_logs.sh \\ - && rm -rf "/tmp/*" + && rm -rf "/tmp/*" "/root/.ccache" EOF } @@ -167,6 +167,7 @@ RUN gem install package_cloud \\ WORKDIR / ENV VPP_ZOMBIE_NOCHECK="1" ENV CCACHE_DIR="/scratch/ccache" +ENV CCACHE_MAXSIZE="10G" EOF generate_dnf_dockerfile_clean } diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh index 4e165e6e..27c297a1 100644 --- a/docker/scripts/lib_yum.sh +++ b/docker/scripts/lib_yum.sh @@ -144,7 +144,7 @@ generate_yum_dockerfile_clean() { # Clean up RUN dbld_dump_build_logs.sh \\ - && rm -rf "/tmp/*" + && rm -rf "/tmp/*" "/root/.ccache" EOF } @@ -170,6 +170,7 @@ RUN gem install package_cloud \\ WORKDIR / ENV VPP_ZOMBIE_NOCHECK="1" ENV CCACHE_DIR="/scratch/ccache" +ENV CCACHE_MAXSIZE="10G" EOF generate_yum_dockerfile_clean } |