diff --git a/Makefile b/Makefile index 9a5a9ddba..34c05ecdb 100644 --- a/Makefile +++ b/Makefile @@ -99,7 +99,7 @@ VERSIONFILENAME=UIVERSION #versions REGISTRYVERSION=v2.6.2 NGINXVERSION=$(VERSIONTAG) -NOTARYVERSION=v0.5.1 +NOTARYVERSION=v0.6.1 MARIADBVERSION=$(VERSIONTAG) CLAIRVERSION=v2.0.4 CLAIRDBVERSION=$(VERSIONTAG) diff --git a/make/photon/Makefile b/make/photon/Makefile index bed679986..d74590829 100644 --- a/make/photon/Makefile +++ b/make/photon/Makefile @@ -158,9 +158,9 @@ _build_notary: @if [ "$(NOTARYFLAG)" = "true" ] ; then \ if [ "$(BUILDBIN)" != "true" ] ; then \ rm -rf $(DOCKERFILEPATH_NOTARY)/binary && mkdir -p $(DOCKERFILEPATH_NOTARY)/binary && \ - $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/notary-signer, $(DOCKERFILEPATH_NOTARY)/binary/notary-signer) && \ - $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/notary-server, $(DOCKERFILEPATH_NOTARY)/binary/notary-server) && \ - $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/notary-migrate-postgresql.tgz, $(DOCKERFILEPATH_NOTARY)/binary/notary-migrate.tgz); \ + $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-signer, $(DOCKERFILEPATH_NOTARY)/binary/notary-signer) && \ + $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-server, $(DOCKERFILEPATH_NOTARY)/binary/notary-server) && \ + $(call _get_binary, https://storage.googleapis.com/harbor-builds/bin/notary/release-$(NOTARYVERSION)/notary-migrate-postgresql.tgz, $(DOCKERFILEPATH_NOTARY)/binary/notary-migrate.tgz); \ cd $(DOCKERFILEPATH_NOTARY)/binary && tar -zvxf notary-migrate.tgz; \ else \ cd $(DOCKERFILEPATH_NOTARY) && $(DOCKERFILEPATH_NOTARY)/builder_public $(NOTARYVERSION); \ diff --git a/make/photon/notary/builder_public b/make/photon/notary/builder similarity index 83% rename from make/photon/notary/builder_public rename to make/photon/notary/builder index 6669800cd..d55f7751d 100755 --- a/make/photon/notary/builder_public +++ b/make/photon/notary/builder @@ -33,8 +33,8 @@ echo 'copy the notary binary to local...' ID=$(docker create notary-golang) echo $ID cd $cur -docker cp $ID:/go/src/github.com/theupdateframework/notary/notary-server binary -docker cp $ID:/go/src/github.com/theupdateframework/notary/notary-signer binary +docker cp $ID:/go/bin/notary-server binary +docker cp $ID:/go/bin/notary-signer binary docker rm -f $ID docker rmi -f notary-golang diff --git a/make/photon/notary/builder_private b/make/photon/notary/builder_private deleted file mode 100755 index f10b7b008..000000000 --- a/make/photon/notary/builder_private +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set +e - -echo "Usage: #./builder_private [notary version]" -if [ -z $1 ]; then - error "Please set the 'version' variable" - exit 1 -fi - -VERSION="$1" -SIGNER_PHOTONIMAGE=vmware/notary-photon:signer-$VERSION -SERVER_PHOTONIMAGE=vmware/notary-photon:server-$VERSION - -set -e - -# the temp folder to store binary file... -mkdir -p binary -rm -rf binary/notary-server || true -rm -rf binary/notary-signer || true - -cd `dirname $0` -cur=$PWD - -# It won't store the notray binary in Harbor repo, so far it's a temporary solution.. -TEMP=`mktemp -d /$TMPDIR/notary.XXXXXX` -git clone https://github.com/reasonerjt/notary-photon $TEMP - -echo 'build the notary binary bases on the golang:1.7.3...' - -cp -rf $TEMP/migrations . -cp $TEMP/migrate . -cp $TEMP/notary-server ./binary/ -cp $TEMP/notary-signer ./binary/ - -docker build -f server.Dockerfile -t $SERVER_PHOTONIMAGE . -docker build -f signer.Dockerfile -t $SIGNER_PHOTONIMAGE . \ No newline at end of file