Merge pull request goharbor#985 from vmware/dev

merge 0.4.5 to master
wy65701436 · Oct 31, 2016 · 98bf17e · 98bf17e
2 parents 576c2b4 + 35217b2
commit 98bf17e
Show file tree

Hide file tree

Showing 854 changed files with 216,554 additions and 948 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,14 @@
 harbor
-Deploy/config/registry/config.yml
-Deploy/config/ui/env
-Deploy/config/ui/app.conf
-Deploy/config/db/env
-Deploy/config/jobservice/env
-Deploy/ui/harbor_ui
-Deploy/jobservice/harbor_jobservice
-ui/ui
+make/common/config/registry/config.yml
+make/common/config/ui/env
+make/common/config/ui/app.conf
+make/common/config/db/env
+make/common/config/jobservice/env
+make/common/config/nginx/nginx.conf
+make/common/config/nginx/cert/*
+make/dev/ui/harbor_ui
+make/dev//jobservice/harbor_jobservice
+src/ui/ui
+src/jobservice/jobservice
 *.pyc
 jobservice/test
diff --git a/.travis.yml b/.travis.yml
@@ -32,12 +32,11 @@ env:
 
 before_install:
    - sudo ./tests/hostcfg.sh
-   - cd Deploy
-   - sudo ./prepare
-   - cd ..
+   - sudo ./make/prepare
 
 install: 
   - sudo apt-get update && sudo apt-get install -y libldap2-dev 
+  - sudo apt-get install -y sqlite3
 #  - sudo apt-get remove -y mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5
 #  - sudo apt-get autoremove -y
 #  - sudo apt-get install -y libaio1
@@ -70,23 +69,24 @@ install:
 
 before_script:
   # create tables and load data
-  # - mysql < ./Deploy/db/registry.sql -uroot --verbose
+  # - mysql < ./make/db/registry.sql -uroot --verbose
+  - sudo sqlite3 /registry.db < make/common/db/registry_sqlite.sql
 
 script:
   - sudo ./tests/testprepare.sh 
-  - docker-compose -f Deploy/docker-compose.test.yml up -d
+  - docker-compose -f ./make/docker-compose.test.yml up -d
   - go list ./... | grep -v -E 'vendor|tests' | xargs -L1 fgt golint
   - go list ./... | grep -v -E 'vendor|tests' | xargs -L1 go vet
   - export MYSQL_HOST=$IP
   - export REGISTRY_URL=$IP:5000
   - echo $REGISTRY_URL
   - ./tests/pushimage.sh 
-  - ./Deploy/coverage4gotest.sh
+  - ./tests/coverage4gotest.sh
   - goveralls -coverprofile=profile.cov -service=travis-ci
 
-  - docker-compose -f Deploy/docker-compose.test.yml down
+  - docker-compose -f make/docker-compose.test.yml down
 
-  - docker-compose -f Deploy/docker-compose.yml up -d
+  - docker-compose -f make/dev/docker-compose.yml up -d
 
   - docker ps
   - go run tests/startuptest.go http://localhost/

diff --git a/Deploy/log/Dockerfile b/Deploy/log/Dockerfile
diff --git a/Deploy/log/logrotate.conf.photon b/Deploy/log/logrotate.conf.photon
diff --git a/Deploy/log/logrotate_docker.conf b/Deploy/log/logrotate_docker.conf