From c04d99b1ab239aaf4446ee44f0920363f6fc9537 Mon Sep 17 00:00:00 2001 From: Daniel Jiang Date: Wed, 4 Jul 2018 17:28:47 +0800 Subject: [PATCH] Workaround the Clair issue in ubuntu updater This commit is a temp fix to workaround coreos/clair#562 Recompiled the code at the tip of release-2.0 branch of clair and updated Makefile. Once clair provides a new release, we'll need to make update in Makefiles and Dockerfiles again to consume it. --- make/photon/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/photon/Makefile b/make/photon/Makefile index 2dbff1e90..fd9bd7c98 100644 --- a/make/photon/Makefile +++ b/make/photon/Makefile @@ -114,7 +114,7 @@ _build_clair: @if [ "$(CLAIRFLAG)" = "true" ] ; then \ if [ "$(BUILDBIN)" != "true" ] ; then \ rm -rf $(DOCKERFILEPATH_CLAIR)/binary && mkdir -p $(DOCKERFILEPATH_CLAIR)/binary && \ - $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/clair, $(DOCKERFILEPATH_CLAIR)/binary/clair); \ + $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/clair-fix-ubuntu-url, $(DOCKERFILEPATH_CLAIR)/binary/clair); \ else \ cd $(DOCKERFILEPATH_CLAIR) && $(DOCKERFILEPATH_CLAIR)/builder $(CLAIRVERSION); \ fi ; \