Commit ac2c1d8f authored by Eric's avatar Eric

Merge branch 'master' of https://github.com/jumpserver/koko

parents c8457f26 b69b2db6
...@@ -13,9 +13,9 @@ RUN dep ensure -vendor-only && cd cmd && go build koko.go ...@@ -13,9 +13,9 @@ RUN dep ensure -vendor-only && cd cmd && go build koko.go
FROM alpine FROM alpine
WORKDIR /opt/koko/ WORKDIR /opt/koko/
COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/koko . COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/koko .
COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/locale . COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/locale/ locale
COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/static . COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/static/ static
COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/templates . COPY --from=stage-build /go/src/github.com/jumpserver/koko/cmd/templates/ templates
RUN echo > config.yml RUN echo > config.yml
EXPOSE 2222 EXPOSE 2222
EXPOSE 5000 EXPOSE 5000
......
...@@ -43,9 +43,9 @@ func StartHTTPServer() { ...@@ -43,9 +43,9 @@ func StartHTTPServer() {
router.PathPrefix("/static/").Handler(http.StripPrefix("/static/", fs)) router.PathPrefix("/static/").Handler(http.StripPrefix("/static/", fs))
router.Handle("/socket.io/", server) router.Handle("/socket.io/", server)
router.HandleFunc("/koko/elfinder/sftp/{host}/", AuthDecorator(sftpHostFinder)) router.HandleFunc("/coco/elfinder/sftp/{host}/", AuthDecorator(sftpHostFinder))
router.HandleFunc("/koko/elfinder/sftp/", AuthDecorator(sftpFinder)) router.HandleFunc("/coco/elfinder/sftp/", AuthDecorator(sftpFinder))
router.HandleFunc("/koko/elfinder/sftp/connector/{host}/", router.HandleFunc("/coco/elfinder/sftp/connector/{host}/",
AuthDecorator(sftpHostConnectorView)).Methods("GET", "POST") AuthDecorator(sftpHostConnectorView)).Methods("GET", "POST")
addr := net.JoinHostPort(conf.BindHost, conf.HTTPPort) addr := net.JoinHostPort(conf.BindHost, conf.HTTPPort)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment