Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add a flag judging on building migrator (#6905) 

This commit is to add a flag judging when to build image of migator, which is not necessary.

Signed-off-by: wang yan <wangyan@vmware.com>
This commit is contained in:
Yan 2019-02-12 20:33:42 +08:00 committed by GitHub
parent 9c8c96ad4f
commit 5412e581de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
make/photon/Makefile
View File

@ -204,9 +204,11 @@ _build_redis:
@echo "Done." @echo "Done."
_build_migrator: _build_migrator:
@echo "building db migrator container for photon..." @if [ "$(MIGRATORFLAG)" = "true" ] ; then \
@cd $(DOCKERFILEPATH_MIGRATOR) && $(DOCKERBUILD) -f $(DOCKERFILEPATH_MIGRATOR)/$(DOCKERFILENAME_MIGRATOR) -t $(DOCKERIMAGENAME_MIGRATOR):$(MIGRATORVERSION) . echo "building db migrator container for photon..."; \
@echo "Done." cd $(DOCKERFILEPATH_MIGRATOR) && $(DOCKERBUILD) -f $(DOCKERFILEPATH_MIGRATOR)/$(DOCKERFILENAME_MIGRATOR) -t $(DOCKERIMAGENAME_MIGRATOR):$(MIGRATORVERSION) . ; \
echo "Done."; \
fi
define _get_binary define _get_binary
$(WGET) --timeout 30 --no-check-certificate $1 -O $2 $(WGET) --timeout 30 --no-check-certificate $1 -O $2

2
tools/migration/Dockerfile
View File

@ -1,4 +1,4 @@
FROM photon:1.0 FROM photon:2.0
ENV PGDATA /var/lib/postgresql/data ENV PGDATA /var/lib/postgresql/data