upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2025-04-22 19:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Alexander Zeitler 2016-04-08 10:01:16 +02:00
commit 8ee0116e9f
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Deploy/docker-compose.yml
View File

@ -36,7 +36,9 @@ services:
syslog-address: "tcp://127.0.0.1:1514" syslog-address: "tcp://127.0.0.1:1514"
syslog-tag: "mysql" syslog-tag: "mysql"
ui: ui:
build: ../ build:
context: ../
dockerfile: Dockerfile.ui
env_file: env_file:
- ./config/ui/env - ./config/ui/env
volumes: volumes:

10
Dockerfile → Dockerfile.ui
View File

@ -9,30 +9,28 @@ RUN apt-get update \
COPY . /go/src/github.com/vmware/harbor COPY . /go/src/github.com/vmware/harbor
#golang.org is blocked in China #golang.org is blocked in China
COPY ./vendor/golang.org /go/src/golang.org 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 ENV GO15VENDOREXPERIMENT 1
RUN go get -d github.com/docker/distribution \ RUN go get -d github.com/docker/distribution \
&& go get -d github.com/docker/libtrust \ && go get -d github.com/docker/libtrust \
&& go get -d github.com/go-sql-driver/mysql \ && 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 \ ENV MYSQL_USR root \
MYSQL_PWD root \ MYSQL_PWD root \
MYSQL_PORT_3306_TCP_ADDR localhost \
MYSQL_PORT_3306_TCP_PORT 3306 \
REGISTRY_URL localhost:5000 REGISTRY_URL localhost:5000
COPY views /go/bin/views COPY views /go/bin/views
COPY static /go/bin/static COPY static /go/bin/static
COPY favicon.ico /go/bin/favicon.ico 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 's/TLS_CACERT/#TLS_CAERT/g' /etc/ldap/ldap.conf \
&& sed -i '$a\TLS_REQCERT allow' /etc/ldap/ldap.conf && sed -i '$a\TLS_REQCERT allow' /etc/ldap/ldap.conf
WORKDIR /go/bin/ WORKDIR /go/bin/
ENTRYPOINT ["/go/bin/harbor"] ENTRYPOINT ["/go/bin/harbor_ui"]
EXPOSE 80 EXPOSE 80

1
contrib/README.md Normal file
View File

@ -0,0 +1 @@
The `contrib` directory contains documents, scripts, and other helpful things which are contributed by community.

2
main.go → ui/main.go
View File

@ -24,7 +24,6 @@ import (
_ "github.com/vmware/harbor/auth/ldap" _ "github.com/vmware/harbor/auth/ldap"
"github.com/vmware/harbor/dao" "github.com/vmware/harbor/dao"
"github.com/vmware/harbor/models" "github.com/vmware/harbor/models"
_ "github.com/vmware/harbor/routers"
"os" "os"
@ -71,5 +70,6 @@ func main() {
if err := updateInitPassword(adminUserID, os.Getenv("HARBOR_ADMIN_PASSWORD")); err != nil { if err := updateInitPassword(adminUserID, os.Getenv("HARBOR_ADMIN_PASSWORD")); err != nil {
log.Error(err) log.Error(err)
} }
initRouters()
beego.Run() beego.Run()
} }

4
routers/router.go → ui/router.go
View File

@ -13,7 +13,7 @@
limitations under the License. limitations under the License.
*/ */
package routers package main
import ( import (
"github.com/vmware/harbor/api" "github.com/vmware/harbor/api"
@ -23,7 +23,7 @@ import (
"github.com/astaxie/beego" "github.com/astaxie/beego"
) )
func init() { func initRouters() {
beego.SetStaticPath("registry/static/i18n", "static/i18n") beego.SetStaticPath("registry/static/i18n", "static/i18n")
beego.SetStaticPath("registry/static/resources", "static/resources") beego.SetStaticPath("registry/static/resources", "static/resources")