Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 10:15:35 +01:00
Code Issues Projects Releases Wiki Activity

fix(feat) fix prepare version in installer

Browse Source 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
This commit is contained in:
Ziming Zhang 2020-02-06 10:58:29 +08:00
parent 72f9e02dd9
commit 6047a8102a
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -226,6 +226,10 @@ DOCKERCOMPOSECHARTMUSEUMTPLFILENAME=docker-compose.chartmuseum.tpl
DOCKERCOMPOSECHARTMUSEUMFILENAME=docker-compose.chartmuseum.yml DOCKERCOMPOSECHARTMUSEUMFILENAME=docker-compose.chartmuseum.yml
SEDCMD=$(shell which sed) SEDCMD=$(shell which sed)
SEDCMDI=$(SEDCMD) -i
ifeq ($(shell uname),Darwin)
SEDCMDI=$(SEDCMD) -i ''
endif
# package # package
TARCMD=$(shell which tar) TARCMD=$(shell which tar)
@ -334,7 +338,11 @@ compile_notary_migrate_patch:
compile: check_environment versions_prepare compile_core compile_jobservice compile_registryctl compile_notary_migrate_patch compile: check_environment versions_prepare compile_core compile_jobservice compile_registryctl compile_notary_migrate_patch
prepare: update_prepare_version:
@echo "substitute the prepare version tag in prepare file..."
@$(SEDCMDI) -e 's/goharbor\/prepare:.*[[:space:]]\+/goharbor\/prepare:$(VERSIONTAG) /' $(MAKEPATH)/prepare ;
prepare: update_prepare_version
@echo "preparing..." @echo "preparing..."
@$(MAKEPATH)/$(PREPARECMD) $(PREPARECMD_PARA) @$(MAKEPATH)/$(PREPARECMD) $(PREPARECMD_PARA)
@ -355,11 +363,11 @@ build_base_docker:
install: compile build prepare start install: compile build prepare start
package_online: package_online: update_prepare_version
@echo "packing online package ..." @echo "packing online package ..."
@cp -r make $(HARBORPKG) @cp -r make $(HARBORPKG)
@if [ -n "$(REGISTRYSERVER)" ] ; then \ @if [ -n "$(REGISTRYSERVER)" ] ; then \
$(SEDCMD) -i -e 's/image\: goharbor/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \ $(SEDCMDI) -e 's/image\: goharbor/image\: $(REGISTRYSERVER)\/$(REGISTRYPROJECTNAME)/' \
$(HARBORPKG)/docker-compose.yml ; \ $(HARBORPKG)/docker-compose.yml ; \
fi fi
@cp LICENSE $(HARBORPKG)/LICENSE @cp LICENSE $(HARBORPKG)/LICENSE
@ -368,7 +376,7 @@ package_online:
@rm -rf $(HARBORPKG) @rm -rf $(HARBORPKG)
@echo "Done." @echo "Done."
package_offline: compile build package_offline: update_prepare_version compile build
@echo "packing offline package ..." @echo "packing offline package ..."
@cp -r make $(HARBORPKG) @cp -r make $(HARBORPKG)

4
make/prepare
View File

@ -32,8 +32,6 @@ fi
data_path=$(grep '^[^#]*data_volume:' $input_dir/harbor.yml | awk '{print $NF}') data_path=$(grep '^[^#]*data_volume:' $input_dir/harbor.yml | awk '{print $NF}')
echo "VERSIONTAG:${VERSIONTAG:=dev}"
# If previous secretkeys exist, move it to new location # If previous secretkeys exist, move it to new location
previous_secretkey_path=/data/secretkey previous_secretkey_path=/data/secretkey
previous_defaultalias_path=/data/defaultalias previous_defaultalias_path=/data/defaultalias
@ -59,7 +57,7 @@ docker run --rm -v $input_dir:/input:z \
-v $config_dir:/config:z \ -v $config_dir:/config:z \
-v $secret_dir:/secret:z \ -v $secret_dir:/secret:z \
-v /:/hostfs:z \ -v /:/hostfs:z \
goharbor/prepare:${VERSIONTAG} $@ goharbor/prepare:dev $@
echo "Clean up the input dir" echo "Clean up the input dir"
# Clean up input dir # Clean up input dir