From c1d74e62481d24802206b2037741a2860df9c998 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Tue, 23 Mar 2021 18:54:36 -0400 Subject: Enable CCACHE in builder images / labels - Remove aarch64 labels which do not have any executor docker images. Change-Id: I1f46929b1c8393aa7a25bad215a95b85f2e00bd9 Signed-off-by: Dave Wallace --- docker/scripts/lib_apt.sh | 3 +-- docker/scripts/lib_dnf.sh | 3 +-- docker/scripts/lib_yum.sh | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'docker') diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index 8994a7829..af9da0b63 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -249,8 +249,7 @@ COPY files/sshconfig /root/.ssh/config WORKDIR / $vpp_install_skip_sysctl_envvar ENV VPP_ZOMBIE_NOCHECK="1" -# TODO: Mount ccache volume into docker container, then remove this. -ENV CCACHE_DISABLE="1" +ENV CCACHE_DIR="/scratch/ccache" EOF generate_apt_dockerfile_clean } diff --git a/docker/scripts/lib_dnf.sh b/docker/scripts/lib_dnf.sh index c5bb5c4a2..34bc40c7f 100644 --- a/docker/scripts/lib_dnf.sh +++ b/docker/scripts/lib_dnf.sh @@ -166,8 +166,7 @@ RUN gem install package_cloud \\ # CI Runtime Environment WORKDIR / ENV VPP_ZOMBIE_NOCHECK="1" -# TODO: Mount ccache volume into docker container, then remove this. -ENV CCACHE_DISABLE="1" +ENV CCACHE_DIR="/scratch/ccache" EOF generate_dnf_dockerfile_clean } diff --git a/docker/scripts/lib_yum.sh b/docker/scripts/lib_yum.sh index b24b2299a..4e165e6e0 100644 --- a/docker/scripts/lib_yum.sh +++ b/docker/scripts/lib_yum.sh @@ -169,8 +169,7 @@ RUN gem install package_cloud \\ # CI Runtime Environment WORKDIR / ENV VPP_ZOMBIE_NOCHECK="1" -# TODO: Mount ccache volume into docker container, then remove this. -ENV CCACHE_DISABLE="1" +ENV CCACHE_DIR="/scratch/ccache" EOF generate_yum_dockerfile_clean } -- cgit 1.2.3-korg