From a5c43f69576d50a04f3d072317499b2046d1b432 Mon Sep 17 00:00:00 2001 From: Hunter Long Date: Sat, 9 Jun 2018 18:36:21 -0700 Subject: [PATCH] first --- .gitignore | 3 ++- .travis.yml | 15 +++++++-------- Dockerfile | 6 +++--- build.sh | 2 +- web.go | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index a2c902b7..d0671b88 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea -rice-box.go \ No newline at end of file +rice-box.go +config.yml \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index b7a3ac24..1902e7d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,12 +29,12 @@ deploy: - provider: releases api_key: $GH_TOKEN file: - - "build/fusioner-osx-x64" - - "build/fusioner-osx-x32" - - "build/fusioner-linux-x64" - - "build/fusioner-linux-x32" - - "build/fusioner-windows-x64.exe" - - "build/fusioner-windows-x32.exe" + - "build/statup-osx-x64" + - "build/statup-osx-x32" + - "build/statup-linux-x64" + - "build/statup-linux-x32" + - "build/statup-windows-x64.exe" + - "build/statup-windows-x32.exe" skip_cleanup: true services: @@ -53,8 +53,7 @@ before_script: - go get github.com/karalabe/xgo - go get github.com/GeertJohan/go.rice - go get github.com/GeertJohan/go.rice/rice - - go get -u golang.org/x/vgo - - vgo get -u + - go get script: - if [[ "$TRAVIS_BRANCH" == "master" ]]; then /bin/bash -c ./build.sh; fi \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1cbbdb20..a06a082b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ FROM golang:alpine as builder RUN apk update && apk add git -COPY . $GOPATH/src/github.com/hunterlong/fusioner/ -WORKDIR $GOPATH/src/github.com/hunterlong/fusioner/ +COPY . $GOPATH/src/github.com/hunterlong/statup/ +WORKDIR $GOPATH/src/github.com/hunterlong/statup/ RUN go get github.com/GeertJohan/go.rice/rice RUN go get -d -v RUN rice embed-go @@ -11,4 +11,4 @@ RUN go install EXPOSE 8080 -ENTRYPOINT fusioner \ No newline at end of file +ENTRYPOINT statup \ No newline at end of file diff --git a/build.sh b/build.sh index e2ffe4cf..90d6d388 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ mkdir build -APP="fusioner" +APP="statup" rice embed-go diff --git a/web.go b/web.go index be234d5e..13563c97 100644 --- a/web.go +++ b/web.go @@ -13,7 +13,7 @@ type dashboard struct { } func RunHTTPServer() { - fmt.Println("Fusioner HTTP Server running on http://localhost:9595") + fmt.Println("Fusioner HTTP Server running on http://localhost:8080") css := http.StripPrefix("/css/", http.FileServer(cssBox.HTTPBox())) js := http.StripPrefix("/js/", http.FileServer(jsBox.HTTPBox())) http.Handle("/", http.HandlerFunc(IndexHandler)) @@ -29,7 +29,7 @@ func RunHTTPServer() { http.Handle("/token/create", http.HandlerFunc(CreateServiceHandler)) http.Handle("/tokens", http.HandlerFunc(ServicesHandler)) http.Handle("/users", http.HandlerFunc(UsersHandler)) - http.ListenAndServe(":9595", nil) + http.ListenAndServe(":8080", nil) } func LogoutHandler(w http.ResponseWriter, r *http.Request) {