diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-04-06 20:41:43 -0400 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2021-04-21 16:51:31 -0400 |
| commit | 8702a6af537154bf10a38a874c0e93eed0fb5f32 (patch) | |
| tree | 3bafb52959b21e964f687b483555c23b95e3df08 /docker | |
| parent | f8747a9f7a238c033f80c54bd18239915b2c0648 (diff) | |
Refactor ccache config to use per-os ccache dirs.
- Simplify ccache state output to console log by
using ccache stats command.
- Bump max size of ccache dir to 10G (centos8 is
approximately 5.7G)
- Clean up extraneous ccache dir after docker build
is complete.
Change-Id: Ia2b55b7cd47212fce91b4567d0cca69d2ce892ed
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
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 a2e5c98a0..725aedcca 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 34bc40c7f..45204210e 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 4e165e6e0..27c297a1c 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 } |