4 files changed, 10 insertions, 4 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
 }
diff --git a/docker/scripts/update_dockerhub_prod_tags.sh b/docker/scripts/update_dockerhub_prod_tags.sh
index 187b640d..890beb3e 100755
--- a/docker/scripts/update_dockerhub_prod_tags.sh
+++ b/docker/scripts/update_dockerhub_prod_tags.sh
@@ -109,7 +109,10 @@ format_image_tags() {
     #       bug in docker hub which returns old tags which were deleted via
     #       the webUI, but are still retrieved by 'docker pull -a'
     image_tags="$(docker images | grep $1 | grep $image_arch | grep -v prod-curr | sort -r | mawk '{print $1":"$2}' | tr '\n' ' ')"
-    image_realname="$(docker images | grep $1 | grep $image_arch | sort -r | grep -v prod | mawk '{print $1":"$2}')"
+    image_realname="$(docker images | grep $1 | grep $image_arch | sort -r | grep -v prod | mawk '{print $1":"$2}' || true)"
+    if [ -z "${image_realname:-}" ] ; then
+        image_realname="$image_tags"
+    fi
 }
 
 get_image_id_tags() {