Merge pull request #76 from reasonerjt/master

switch to docker-compose v2 template
goharbor · Apr 2, 2016 · 864b814 · 864b814
2 parents fedbb1b + 07887fd
commit 864b814
Show file tree

Hide file tree

Showing 8 changed files with 81 additions and 80 deletions.
diff --git a/Deploy/docker-compose.yml b/Deploy/docker-compose.yml
@@ -1,62 +1,67 @@
-log:
-  build: ./log/
-  volumes:
-    - /var/log/harbor/:/var/log/docker/
-  ports:
-    - 1514:514
-registry:
-  image: library/registry:2.3.0
-  volumes:
-    - /data/registry:/storage
-    - ./config/registry/:/etc/registry/
-  ports:
-    - 5001:5001
-  command:
-    /etc/registry/config.yml
-  links:
-    - log
-  log_driver: "syslog"
-  log_opt:
-    syslog-address: "tcp://127.0.0.1:1514"
-    syslog-tag: "registry"
-mysql:
-  build: ./db/
-  volumes:
-    - /data/database:/var/lib/mysql
-  env_file:
-    - ./config/db/env
-  links:
-    - log
-  log_driver: "syslog"
-  log_opt:
-    syslog-address: "tcp://127.0.0.1:1514"
-    syslog-tag: "mysql"
-ui:
-  build: ../
-  env_file:
-    - ./config/ui/env
-  volumes:
-    - ./config/ui/app.conf:/etc/ui/app.conf
-    - ./config/ui/private_key.pem:/etc/ui/private_key.pem
-  links:
-    - registry
-    - mysql
-    - log
-  log_driver: "syslog"
-  log_opt:
-    syslog-address: "tcp://127.0.0.1:1514"
-    syslog-tag: "ui"
-proxy:
-  image: library/nginx:1.9
-  volumes:
-    - ./config/nginx:/etc/nginx
-  links:
-    - ui
-    - registry
-    - log
-  ports:
-    - 80:80
-  log_driver: "syslog"
-  log_opt:
-    syslog-address: "tcp://127.0.0.1:1514"
-    syslog-tag: "proxy"
+version: '2'
+services:
+  log:
+    build: ./log/
+    volumes:
+      - /var/log/harbor/:/var/log/docker/
+    ports:
+      - 1514:514
+  registry:
+    image: library/registry:2.3.0
+    volumes:
+      - /data/registry:/storage
+      - ./config/registry/:/etc/registry/
+    ports:
+      - 5001:5001
+    command:
+      /etc/registry/config.yml
+    depends_on:
+      - log
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        syslog-tag: "registry"
+  mysql:
+    build: ./db/
+    volumes:
+      - /data/database:/var/lib/mysql
+    env_file:
+      - ./config/db/env
+    depends_on:
+      - log
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        syslog-tag: "mysql"
+  ui:
+    build: ../
+    env_file:
+      - ./config/ui/env
+    volumes:
+      - ./config/ui/app.conf:/etc/ui/app.conf
+      - ./config/ui/private_key.pem:/etc/ui/private_key.pem
+    depends_on:
+      - log
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        syslog-tag: "ui"
+  proxy:
+    image: library/nginx:1.9
+    volumes:
+      - ./config/nginx:/etc/nginx
+    ports:
+      - 80:80
+    depends_on:
+      - mysql
+      - registry
+      - ui
+      - log
+    logging:
+      driver: "syslog"
+      options:  
+        syslog-address: "tcp://127.0.0.1:1514"
+        syslog-tag: "proxy"
diff --git a/Deploy/prepare b/Deploy/prepare
@@ -60,6 +60,7 @@ for f in conf_files:
 render(os.path.join(templates_dir, "ui", "env"),
         ui_conf_env,
         hostname=hostname,
+        db_password=db_password,
         ui_url=ui_url,
         auth_mode=auth_mode,
         admin_pwd=harbor_admin_password,

diff --git a/Deploy/templates/registry/config.yml b/Deploy/templates/registry/config.yml
@@ -27,7 +27,7 @@ notifications:
   endpoints:
       - name: harbor
         disabled: false
-        url: $ui_url/service/notifications
+        url: http://ui/service/notifications
         timeout: 500
         threshold: 5
         backoff: 1000
diff --git a/Deploy/templates/ui/env b/Deploy/templates/ui/env
@@ -1,5 +1,7 @@
 MYSQL_HOST=mysql
+MYSQL_PORT=3306
 MYSQL_USR=root
+MYSQL_PWD=$db_password
 REGISTRY_URL=http://registry:5000
 CONFIG_PATH=/etc/ui/app.conf
 HARBOR_REG_URL=$hostname

diff --git a/dao/base.go b/dao/base.go
@@ -66,18 +66,11 @@ func GenerateRandomString() (string, error) {
 func InitDB() {
 	orm.RegisterDriver("mysql", orm.DRMySQL)
 	addr := os.Getenv("MYSQL_HOST")
-	if len(addr) == 0 {
-		addr = os.Getenv("MYSQL_PORT_3306_TCP_ADDR")
-	}
-
-	port := os.Getenv("MYSQL_PORT_3306_TCP_PORT")
+	port := os.Getenv("MYSQL_PORT")
 	username := os.Getenv("MYSQL_USR")
+	password := os.Getenv("MYSQL_PWD")
 
-	password := os.Getenv("MYSQL_ENV_MYSQL_ROOT_PASSWORD")
-	if len(password) == 0 {
-		password = os.Getenv("MYSQL_PWD")
-	}
-
+	log.Debugf("db url: %s:%s, db user: %s", addr, port, username)
 	dbStr := username + ":" + password + "@tcp(" + addr + ":" + port + ")/registry"
 	ch := make(chan int, 1)
 	go func() {

diff --git a/dao/dao_test.go b/dao/dao_test.go
@@ -128,8 +128,8 @@ func TestMain(m *testing.M) {
 
 	log.Infof("DB_HOST: %s, DB_USR: %s, DB_PORT: %s, DB_PWD: %s\n", dbHost, dbUser, dbPort, dbPassword)
 
-	os.Setenv("MYSQL_PORT_3306_TCP_ADDR", dbHost)
-	os.Setenv("MYSQL_PORT_3306_TCP_PORT", dbPort)
+	os.Setenv("MYSQL_HOST", dbHost)
+	os.Setenv("MYSQL_PORT", dbPort)
 	os.Setenv("MYSQL_USR", dbUser)
 	os.Setenv("MYSQL_PWD", dbPassword)
 	os.Setenv("AUTH_MODE", "db_auth")

diff --git a/docs/installation_guide.md b/docs/installation_guide.md
@@ -5,7 +5,7 @@ Harbor can be installed from the source code by using "docker-compose up" comman
 Harbor is deployed as several Docker containers. Hence, it can be deployed on any Linux distribution that supports Docker. 
 Before deploying Harbor, the target machine requires Python, Docker, Docker Compose to be installed.  
 * Python should be version 2.7 or higher.  Some Linux distributions (Gentoo, Arch) may not have a Python interpreter installed by default. On those systems, you need to install Python manually.  
-* The Docker engine should be version 1.8 or higher.  For the details to install Docker engine, please refer to: https://docs.docker.com/engine/installation/
+* The Docker engine should be version 1.10 or higher.  For the details to install Docker engine, please refer to: https://docs.docker.com/engine/installation/
 * The Docker Compose needs to be version 1.6.0 or higher.  For the details to install Docker compose, please refer to: https://docs.docker.com/compose/install/
 
 ### Configuration of Harbor 
@@ -139,4 +139,4 @@ Removing harbor_mysql_1 ... done
 
 ### Persistent data and log files
 By default, the data of database and image files in the registry are persisted in the directory **/data/** of the target machine. When Harbor's containers are removed and recreated, the data  remain unchanged. 
-Harbor leverages rsyslog to collect the logs of each container, by default the log files are stored in the directory **/var/log/harbor/** on Harbor's host.
+Harbor leverages rsyslog to collect the logs of each container, by default the log files are stored in the directory **/var/log/harbor/** on Harbor's host.
diff --git a/utils/log/logger.go b/utils/log/logger.go
@@ -263,12 +263,12 @@ func line(calldepth int) string {
 		line = 0
 	}
 
-	for i := len(file) - 1; i > 0; i-- {
-		if file[i] == '/' {
+	for i := len(file) - 2; i > 0; i-- {
+		if file[i] == os.PathSeparator {
 			file = file[i+1:]
 			break
 		}
 	}
 
-	return fmt.Sprintf("%s:%d", file, line)
+	return fmt.Sprintf("[%s:%d]:", file, line)
 }