From 42c398fac8f45d986bd5c9ad91e9a16dc06bbf07 Mon Sep 17 00:00:00 2001
From: Tan Jiang <jiangd@vmware.com>
Date: Thu, 7 Apr 2016 18:34:12 +0800
Subject: [PATCH 1/3] refactor

---
 Deploy/docker-compose.yml   |  4 +++-
 Dockerfile => Dockerfile.ui | 10 ++++------
 main.go => ui/main.go       |  2 +-
 {routers => ui}/router.go   | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename Dockerfile => Dockerfile.ui (78%)
 rename main.go => ui/main.go (98%)
 rename {routers => ui}/router.go (92%)

diff --git a/Deploy/docker-compose.yml b/Deploy/docker-compose.yml
index 2a223cd95..0bead2e5d 100644
--- a/Deploy/docker-compose.yml
+++ b/Deploy/docker-compose.yml
@@ -36,7 +36,9 @@ services:
         syslog-address: "tcp://127.0.0.1:1514"
         syslog-tag: "mysql"
   ui:
-    build: ../
+    build:
+      context: ../
+      dockerfile: Dockerfile.ui
     env_file:
       - ./config/ui/env
     volumes:
diff --git a/Dockerfile b/Dockerfile.ui
similarity index 78%
rename from Dockerfile
rename to Dockerfile.ui
index 535881d3b..459158279 100644
--- a/Dockerfile
+++ b/Dockerfile.ui
@@ -9,30 +9,28 @@ RUN apt-get update \
 COPY . /go/src/github.com/vmware/harbor
 #golang.org is blocked in China
 COPY ./vendor/golang.org /go/src/golang.org 
-WORKDIR /go/src/github.com/vmware/harbor
+WORKDIR /go/src/github.com/vmware/harbor/ui
 
 ENV GO15VENDOREXPERIMENT 1
 RUN go get -d github.com/docker/distribution \
     && go get -d github.com/docker/libtrust \
     && go get -d github.com/go-sql-driver/mysql \
-    && go install -v -a 
+    && go build -v -a -o /go/bin/harbor_ui
 
 ENV MYSQL_USR root \
     MYSQL_PWD root \
-    MYSQL_PORT_3306_TCP_ADDR localhost \
-    MYSQL_PORT_3306_TCP_PORT 3306 \
     REGISTRY_URL localhost:5000
 
 COPY views /go/bin/views
 COPY static /go/bin/static
 COPY favicon.ico /go/bin/favicon.ico
 
-RUN chmod u+x /go/bin/harbor \
+RUN chmod u+x /go/bin/harbor_ui \
     && sed -i 's/TLS_CACERT/#TLS_CAERT/g' /etc/ldap/ldap.conf \
     && sed -i '$a\TLS_REQCERT allow' /etc/ldap/ldap.conf
 
 WORKDIR /go/bin/
-ENTRYPOINT ["/go/bin/harbor"]
+ENTRYPOINT ["/go/bin/harbor_ui"]
 
 EXPOSE 80
 
diff --git a/main.go b/ui/main.go
similarity index 98%
rename from main.go
rename to ui/main.go
index 60d36bfd1..fdfd3f139 100644
--- a/main.go
+++ b/ui/main.go
@@ -24,7 +24,6 @@ import (
 	_ "github.com/vmware/harbor/auth/ldap"
 	"github.com/vmware/harbor/dao"
 	"github.com/vmware/harbor/models"
-	_ "github.com/vmware/harbor/routers"
 
 	"os"
 
@@ -71,5 +70,6 @@ func main() {
 	if err := updateInitPassword(adminUserID, os.Getenv("HARBOR_ADMIN_PASSWORD")); err != nil {
 		log.Error(err)
 	}
+	initRouters()
 	beego.Run()
 }
diff --git a/routers/router.go b/ui/router.go
similarity index 92%
rename from routers/router.go
rename to ui/router.go
index 6cce814bc..1853192f0 100644
--- a/routers/router.go
+++ b/ui/router.go
@@ -13,7 +13,7 @@
    limitations under the License.
 */
 
-package routers
+package main
 
 import (
 	"github.com/vmware/harbor/api"
@@ -23,11 +23,11 @@ import (
 	"github.com/astaxie/beego"
 )
 
-func init() {
+func initRouters() {
 
-	beego.SetStaticPath("registry/static/i18n", "static/i18n")
-	beego.SetStaticPath("registry/static/resources", "static/resources")
-	beego.SetStaticPath("registry/static/vendors", "static/vendors")
+	beego.SetStaticPath("registry/static/i18n", "/static/i18n")
+	beego.SetStaticPath("registry/static/resources", "/static/resources")
+	beego.SetStaticPath("registry/static/vendors", "/static/vendors")
 
 	beego.Router("/login", &controllers.CommonController{}, "post:Login")
 	beego.Router("/logout", &controllers.CommonController{}, "get:Logout")

From d725947517e971a215fc35bbadce40b95d7f4b08 Mon Sep 17 00:00:00 2001
From: Tan Jiang <jiangd@vmware.com>
Date: Thu, 7 Apr 2016 18:44:29 +0800
Subject: [PATCH 2/3] fix path typo

---
 ui/router.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/router.go b/ui/router.go
index 1853192f0..4eb04108b 100644
--- a/ui/router.go
+++ b/ui/router.go
@@ -25,9 +25,9 @@ import (
 
 func initRouters() {
 
-	beego.SetStaticPath("registry/static/i18n", "/static/i18n")
-	beego.SetStaticPath("registry/static/resources", "/static/resources")
-	beego.SetStaticPath("registry/static/vendors", "/static/vendors")
+	beego.SetStaticPath("registry/static/i18n", "static/i18n")
+	beego.SetStaticPath("registry/static/resources", "static/resources")
+	beego.SetStaticPath("registry/static/vendors", "static/vendors")
 
 	beego.Router("/login", &controllers.CommonController{}, "post:Login")
 	beego.Router("/logout", &controllers.CommonController{}, "get:Logout")

From c8781cf66f60cc4454b75c92f1973cd78378ebec Mon Sep 17 00:00:00 2001
From: Tan Jiang <jiangd@vmware.com>
Date: Fri, 8 Apr 2016 12:06:56 +0800
Subject: [PATCH 3/3] create contrib directory

---
 contrib/README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 contrib/README.md

diff --git a/contrib/README.md b/contrib/README.md
new file mode 100644
index 000000000..b11059165
--- /dev/null
+++ b/contrib/README.md
@@ -0,0 +1 @@
+The `contrib` directory contains documents, scripts, and other helpful things which are contributed by community.