Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-02 04:51:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8308 from ninjadq/upgrade_chartmuseum_2_v0_9_0

Browse Source 
Upgrade chartmuseum from v0.8.1 to v0.9.0
This commit is contained in:
Qian Deng 2019-07-17 16:48:52 +08:00 committed by GitHub
commit 739b4723db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -107,7 +107,7 @@ REDISVERSION=$(VERSIONTAG)
NOTARYMIGRATEVERSION=v3.5.4 NOTARYMIGRATEVERSION=v3.5.4
# version of chartmuseum # version of chartmuseum
CHARTMUSEUMVERSION=v0.8.1 CHARTMUSEUMVERSION=v0.9.0
define VERSIONS_FOR_PREPARE define VERSIONS_FOR_PREPARE
VERSION_TAG: $(VERSIONTAG) VERSION_TAG: $(VERSIONTAG)

6
make/photon/chartserver/builder
View File

@ -4,7 +4,7 @@ set +e
usage(){ usage(){
echo "Usage: builder <golang image:version> <code path> <code release tag> <main.go path> <binary name>" echo "Usage: builder <golang image:version> <code path> <code release tag> <main.go path> <binary name>"
echo "e.g: builder golang:1.11.2 github.com/helm/chartmuseum v0.8.1 cmd/chartmuseum chartm" echo "e.g: builder golang:1.11.2 github.com/helm/chartmuseum v0.9.0 cmd/chartmuseum chartm"
exit 1 exit 1
} }
@ -13,7 +13,7 @@ if [ $# != 5 ]; then
fi fi
GOLANG_IMAGE="$1" GOLANG_IMAGE="$1"
CODE_PATH="$2" GIT_PATH="$2"
CODE_VERSION="$3" CODE_VERSION="$3"
MAIN_GO_PATH="$4" MAIN_GO_PATH="$4"
BIN_NAME="$5" BIN_NAME="$5"
@ -27,7 +27,7 @@ mkdir -p binary
rm -rf binary/$BIN_NAME || true rm -rf binary/$BIN_NAME || true
cp compile.sh binary/ cp compile.sh binary/
docker run -it -v $cur/binary:/go/bin --name golang_code_builder $GOLANG_IMAGE /bin/bash /go/bin/compile.sh $CODE_PATH $CODE_VERSION $MAIN_GO_PATH $BIN_NAME docker run -it --rm -v $cur/binary:/go/bin --name golang_code_builder $GOLANG_IMAGE /bin/bash /go/bin/compile.sh $GIT_PATH $CODE_VERSION $MAIN_GO_PATH $BIN_NAME
#Clear #Clear
docker rm -f golang_code_builder docker rm -f golang_code_builder

17
make/photon/chartserver/compile.sh
View File

@ -11,24 +11,21 @@ if [ $# != 4 ]; then
usage usage
fi fi
CODE_PATH="$1" GIT_PATH="$1"
VERSION="$2" VERSION="$2"
MAIN_GO_PATH="$3" MAIN_GO_PATH="$3"
BIN_NAME="$4" BIN_NAME="$4"
#Get the source code of chartmusem #Get the source code
go get $CODE_PATH git clone $GIT_PATH src_code
ls
SRC_PATH=$(pwd)/src_code
set -e set -e
#Checkout the released tag branch #Checkout the released tag branch
cd /go/src/$CODE_PATH cd $SRC_PATH
git checkout tags/$VERSION -b $VERSION git checkout tags/$VERSION -b $VERSION
#Install the go dep tool to restore the package dependencies
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep ensure
#Compile #Compile
cd /go/src/$CODE_PATH/$MAIN_GO_PATH && go build -a -o $BIN_NAME cd $SRC_PATH/$MAIN_GO_PATH && go build -a -o $BIN_NAME
mv $BIN_NAME /go/bin/ mv $BIN_NAME /go/bin/

2
make/photon/prepare/utils/docker_compose.py
View File

@ -14,7 +14,7 @@ def prepare_docker_compose(configs, with_clair, with_notary, with_chartmuseum):
REGISTRY_VERSION = versions.get('REGISTRY_VERSION') or 'v2.7.1' REGISTRY_VERSION = versions.get('REGISTRY_VERSION') or 'v2.7.1'
NOTARY_VERSION = versions.get('NOTARY_VERSION') or 'v0.6.1' NOTARY_VERSION = versions.get('NOTARY_VERSION') or 'v0.6.1'
CLAIR_VERSION = versions.get('CLAIR_VERSION') or 'v2.0.7' CLAIR_VERSION = versions.get('CLAIR_VERSION') or 'v2.0.7'
CHARTMUSEUM_VERSION = versions.get('CHARTMUSEUM_VERSION') or 'v0.8.1' CHARTMUSEUM_VERSION = versions.get('CHARTMUSEUM_VERSION') or 'v0.9.0'
rendering_variables = { rendering_variables = {
'version': VERSION_TAG, 'version': VERSION_TAG,