github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

docker fix

pull/41/head^2
Hunter Long 2018-08-15 23:52:13 -07:00
parent 0ff05b2b6f
commit eba044fd81
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore
View File

@ -10,3 +10,4 @@
!/cmd !/cmd
!/Makefile !/Makefile
!/README.md !/README.md
!/LICENSE

25
Makefile
View File

@ -9,7 +9,6 @@ GOINSTALL=$(GOCMD) install
XGO=GOPATH=$(GOPATH) $(GOPATH)/bin/xgo -go 1.10.x --dest=build XGO=GOPATH=$(GOPATH) $(GOPATH)/bin/xgo -go 1.10.x --dest=build
BUILDVERSION=-ldflags "-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT)" BUILDVERSION=-ldflags "-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT)"
RICE=$(GOPATH)/bin/rice RICE=$(GOPATH)/bin/rice
DOCKER=docker
PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH) PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH)
PUBLISH_BODY='{ "request": { "branch": "master", "config": { "env": { "VERSION": "$(VERSION)" } } } }' PUBLISH_BODY='{ "request": { "branch": "master", "config": { "env": { "VERSION": "$(VERSION)" } } } }'
@ -55,33 +54,33 @@ build-all: clean compile
$(XGO) $(BUILDVERSION) --targets=windows-6.0/amd64 ./cmd $(XGO) $(BUILDVERSION) --targets=windows-6.0/amd64 ./cmd
$(XGO) $(BUILDVERSION) --targets=linux/arm-7 ./cmd $(XGO) $(BUILDVERSION) --targets=linux/arm-7 ./cmd
$(XGO) $(BUILDVERSION) --targets=linux/arm64 ./cmd $(XGO) $(BUILDVERSION) --targets=linux/arm64 ./cmd
$(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) -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd
build-alpine: clean compile build-alpine: clean compile
mkdir build mkdir build
$(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) -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd
docker: docker:
$(DOCKER) build -t hunterlong/statup:latest . docker build -t hunterlong/statup:latest .
docker-dev: docker-dev:
$(DOCKER) build -t hunterlong/statup:dev -f ./cmd/Dockerfile . docker build -t hunterlong/statup:dev -f ./cmd/Dockerfile .
docker-test: docker-test:
$(DOCKER) build -t hunterlong/statup:test -f ./.travis/Dockerfile . docker build -t hunterlong/statup:test -f ./.travis/Dockerfile .
docker-run: docker docker-run: docker
$(DOCKER) run -t -p 8080:8080 hunterlong/statup:latest docker run -t -p 8080:8080 hunterlong/statup:latest
docker-run-dev: docker-dev docker-run-dev: docker-dev
$(DOCKER) run -t -p 8080:8080 hunterlong/statup:dev docker run -t -p 8080:8080 hunterlong/statup:dev
docker-run-test: docker-test docker-run-test: docker-test
$(DOCKER) run -t -p 8080:8080 hunterlong/statup:test docker run -t -p 8080:8080 hunterlong/statup:test
databases: databases:
$(DOCKER) run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres docker run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres
$(DOCKER) run --name statup_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password123 -e MYSQL_DATABASE=root -d mysql docker run --name statup_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password123 -e MYSQL_DATABASE=root -d mysql
sleep 30 sleep 30
deps: deps:
@ -163,9 +162,9 @@ publish-latest:
curl -H "Content-Type: application/json" --data '{"docker_tag": "latest"}' -X POST $(DOCKER) curl -H "Content-Type: application/json" --data '{"docker_tag": "latest"}' -X POST $(DOCKER)
publish-homebrew: publish-homebrew:
curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d "$(PUBLISH_BODY)" https://api.travis-ci.com/repo/hunterlong%2Fhomebrew-statup/requests curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d $(PUBLISH_BODY) https://api.travis-ci.com/repo/hunterlong%2Fhomebrew-statup/requests
publish-crypress: publish-crypress:
curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d "$(PUBLISH_BODY)" https://api.travis-ci.com/repo/hunterlong%2Fstatup-testing/requests curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d $(PUBLISH_BODY) https://api.travis-ci.com/repo/hunterlong%2Fstatup-testing/requests
.PHONY: build build-all build-alpine .PHONY: build build-all build-alpine

2
cmd/main.go
View File

@ -45,7 +45,7 @@ func init() {
} }
func parseFlags() { func parseFlags() {
ip := flag.String("ip", "localhost", "IP address to run the Statup HTTP server") ip := flag.String("ip", "0.0.0.0", "IP address to run the Statup HTTP server")
p := flag.Int("port", 8080, "Port to run the HTTP server") p := flag.Int("port", 8080, "Port to run the HTTP server")
flag.Parse() flag.Parse()
ipAddress = *ip ipAddress = *ip