From a5e7ac91646fb4aae7de153d075cd326f03cbeac Mon Sep 17 00:00:00 2001 From: Yan Date: Wed, 17 Oct 2018 16:04:14 +0800 Subject: [PATCH] Upgrade notary complile golang version to 1.9.4 (#6064) This commit is to upgrade the golang version to 1.9.4, it because a bug of golang 17.3 could introduce one dns resolver issue for harbor mentioned by #6031. The bug of golang is https://github.com/golang/go/issues/15419, it makes harbor containers to lookup 'endpoint.' firstly which may cause network issue. Signed-off-by: wang yan --- make/photon/notary/binary.Dockerfile | 2 +- make/photon/notary/builder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/photon/notary/binary.Dockerfile b/make/photon/notary/binary.Dockerfile index 7aafee012..1b9d73096 100644 --- a/make/photon/notary/binary.Dockerfile +++ b/make/photon/notary/binary.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7.3 +FROM golang:1.9.4 ENV NOTARYPKG github.com/theupdateframework/notary diff --git a/make/photon/notary/builder b/make/photon/notary/builder index d55f7751d..3dd5df358 100755 --- a/make/photon/notary/builder +++ b/make/photon/notary/builder @@ -23,7 +23,7 @@ cur=$PWD TEMP=`mktemp -d /$TMPDIR/notary.XXXXXX` git clone -b $VERSION https://github.com/theupdateframework/notary.git $TEMP -echo 'build the notary binary bases on the golang:1.7.3...' +echo 'build the notary binary bases on the golang:1.9.4...' cp binary.Dockerfile $TEMP cd $TEMP docker build -f binary.Dockerfile -t notary-golang $TEMP