mirror of https://github.com/statping/statping
updates
parent
c24e073942
commit
2b76781571
|
@ -1,4 +1,4 @@
|
||||||
FROM hunterlong/statup:base-v0.5
|
FROM hunterlong/statup:base-v0.51
|
||||||
MAINTAINER "Hunter Long (https://github.com/hunterlong)"
|
MAINTAINER "Hunter Long (https://github.com/hunterlong)"
|
||||||
|
|
||||||
# Locked version of Statup for 'latest' Docker tag
|
# Locked version of Statup for 'latest' Docker tag
|
||||||
|
@ -8,4 +8,4 @@ ENV STATUP_DIR=/app
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
VOLUME /app
|
VOLUME /app
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
CMD ["statup"]
|
CMD ["statup"]
|
||||||
|
|
7
Makefile
7
Makefile
|
@ -100,7 +100,7 @@ docker-push-base:
|
||||||
docker push hunterlong/statup:base
|
docker push hunterlong/statup:base
|
||||||
docker push hunterlong/statup:base-v$(VERSION)
|
docker push hunterlong/statup:base-v$(VERSION)
|
||||||
|
|
||||||
docker-build-base: clean
|
docker-build-base:
|
||||||
wget -q https://assets.statup.io/sass && chmod +x sass
|
wget -q https://assets.statup.io/sass && chmod +x sass
|
||||||
$(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -linkmode external -extldflags -static" -out alpine ./cmd
|
$(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -linkmode external -extldflags -static" -out alpine ./cmd
|
||||||
docker build -t hunterlong/statup:base --no-cache -f dev/Dockerfile-base .
|
docker build -t hunterlong/statup:base --no-cache -f dev/Dockerfile-base .
|
||||||
|
@ -135,7 +135,7 @@ dev-deps: dep
|
||||||
$(GOCMD) get github.com/mgechev/revive
|
$(GOCMD) get github.com/mgechev/revive
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf ./{logs,assets,plugins,statup.db,config.yml,.sass-cache,config.yml,statup,build,.sass-cache,statup.db,index.html}
|
rm -rf ./{logs,assets,plugins,statup.db,config.yml,.sass-cache,config.yml,statup,build,.sass-cache,statup.db,index.html,vendor}
|
||||||
rm -rf cmd/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
rm -rf cmd/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
||||||
rm -rf core/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
rm -rf core/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
||||||
rm -rf handlers/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
rm -rf handlers/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
||||||
|
@ -144,8 +144,7 @@ clean:
|
||||||
rm -rf types/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
rm -rf types/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
||||||
rm -rf utils/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
rm -rf utils/{logs,assets,plugins,statup.db,config.yml,.sass-cache,*.log}
|
||||||
rm -rf dev/test/cypress/videos
|
rm -rf dev/test/cypress/videos
|
||||||
rm -f coverage.out
|
rm -f coverage.* sass
|
||||||
rm -f coverage.json
|
|
||||||
|
|
||||||
tag:
|
tag:
|
||||||
git tag "v$(VERSION)" --force
|
git tag "v$(VERSION)" --force
|
||||||
|
|
|
@ -95,4 +95,4 @@ context('Service Tests', () => {
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
|
@ -16,7 +16,6 @@
|
||||||
package handlers
|
package handlers
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"github.com/hunterlong/statup/core"
|
"github.com/hunterlong/statup/core"
|
||||||
"github.com/hunterlong/statup/types"
|
"github.com/hunterlong/statup/types"
|
||||||
"github.com/hunterlong/statup/utils"
|
"github.com/hunterlong/statup/utils"
|
||||||
|
@ -40,6 +39,23 @@ func TrayHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func DesktopInit(ip string, port int) {
|
func DesktopInit(ip string, port int) {
|
||||||
|
var err error
|
||||||
|
exists := utils.FileExists(utils.Directory + "/statup.db")
|
||||||
|
if exists {
|
||||||
|
core.Configs, err = core.LoadConfig()
|
||||||
|
if err != nil {
|
||||||
|
utils.Log(3, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
err = core.DbConnection(core.Configs.Connection, false, utils.Directory)
|
||||||
|
if err != nil {
|
||||||
|
utils.Log(3, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
core.InitApp()
|
||||||
|
RunHTTPServer(ip, port)
|
||||||
|
}
|
||||||
|
|
||||||
config := &core.DbConfig{DbConfig: &types.DbConfig{
|
config := &core.DbConfig{DbConfig: &types.DbConfig{
|
||||||
DbConn: "sqlite",
|
DbConn: "sqlite",
|
||||||
Project: "Statup",
|
Project: "Statup",
|
||||||
|
@ -52,9 +68,7 @@ func DesktopInit(ip string, port int) {
|
||||||
Location: utils.Directory,
|
Location: utils.Directory,
|
||||||
}}
|
}}
|
||||||
|
|
||||||
fmt.Println(config)
|
err = config.Save()
|
||||||
|
|
||||||
err := config.Save()
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
utils.Log(4, err)
|
utils.Log(4, err)
|
||||||
}
|
}
|
||||||
|
|
|
@ -416,7 +416,7 @@ HTML, BODY {
|
||||||
padding: 5px 5px; }
|
padding: 5px 5px; }
|
||||||
|
|
||||||
.lg_number {
|
.lg_number {
|
||||||
font-size: 9vw; }
|
font-size: 8.1vw; }
|
||||||
|
|
||||||
.stats_area {
|
.stats_area {
|
||||||
margin-top: 1.5rem !important;
|
margin-top: 1.5rem !important;
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.lg_number {
|
.lg_number {
|
||||||
font-size: 9vw;
|
font-size: 8.1vw;
|
||||||
}
|
}
|
||||||
|
|
||||||
.stats_area {
|
.stats_area {
|
||||||
|
@ -80,4 +80,4 @@
|
||||||
.list-group-item P {
|
.list-group-item P {
|
||||||
font-size: 0.7rem;
|
font-size: 0.7rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -87,6 +87,15 @@ func UnderScoreString(str string) string {
|
||||||
return newStr
|
return newStr
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func FileExists(name string) bool {
|
||||||
|
if _, err := os.Stat(name); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
func DeleteFile(file string) error {
|
func DeleteFile(file string) error {
|
||||||
err := os.Remove(file)
|
err := os.Remove(file)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
Loading…
Reference in New Issue