diff --git a/.travis/build.sh b/.travis/build.sh index f93097dd..9cfcf660 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -14,8 +14,6 @@ xgo -go 1.10.x --targets=linux/arm-7 --dest=build -ldflags="-X main.VERSION=$VER xgo -go 1.10.x --targets=linux/arm64 --dest=build -ldflags="-X main.VERSION=$VERSION" ./ xgo -go 1.10.x --targets=linux/amd64 --dest=build -ldflags="-X main.VERSION=$VERSION -linkmode external -extldflags -static" -out alpine ./ - - cd build ls diff --git a/.travis/deploy.sh b/.travis/deploy.sh index c857d9e8..b359a322 100755 --- a/.travis/deploy.sh +++ b/.travis/deploy.sh @@ -1,35 +1,29 @@ #!/usr/bin/env bash # update homebrew to newest version by building on travis -#body='{ -# "request": { -# "branch":"master", -# "config": { -# "merge_mode": "merge", -# "env": { -# "VERSION": "'"$VERSION"'" -# } -# } -# } -#}' -#curl -s -X POST \ -# -H "Content-Type: application/json" \ -# -H "Accept: application/json" \ -# -H "Travis-API-Version: 3" \ -# -H "Authorization: token $TRAVIS_API" \ -# -d "$body" \ -# https://api.travis-ci.com/repo/hunterlong%2Fhomebrew-statup/requests +body='{ + "request": { + "branch":"master" + } +}' +curl -s -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token $TRAVIS_API" \ + -d "$body" \ + https://api.travis-ci.com/repo/hunterlong%2Fstatup-testing/requests -git clone https://$GH_USER:$GH_TOKEN@github.com/hunterlong/homebrew-statup.git -cd homebrew-statup +#git clone https://$GH_USER:$GH_TOKEN@github.com/hunterlong/homebrew-statup.git +#cd homebrew-statup +# +#./build.sh +#cd ../ -./build.sh -cd ../ - -docker login -u $DOCKER_USER -p $DOCKER_PASS $DOCKER_URL -docker build -t $DOCKER_URL/hunterlong/statup . -docker push $DOCKER_URL/hunterlong/statup +#docker login -u $DOCKER_USER -p $DOCKER_PASS $DOCKER_URL +#docker build -t $DOCKER_URL/hunterlong/statup . +#docker push $DOCKER_URL/hunterlong/statup if [ "$TRAVIS_BRANCH" != "master" ] then diff --git a/source/tmpl/setup.html b/source/tmpl/setup.html index 88b33954..ed57d2e7 100644 --- a/source/tmpl/setup.html +++ b/source/tmpl/setup.html @@ -48,11 +48,11 @@ </div> <div class="form-group" id="db_password"> <label for="formGroupExampleInput2">Password</label> - <input type="password" name="db_password" class="form-control" value="{{.DbPass}}" id="formGroupExampleInput2" value="" placeholder="password123"> + <input type="password" name="db_password" class="form-control" value="{{.DbPass}}" id="formGroupExampleInput2" placeholder="password123"> </div> <div class="form-group" id="db_database"> <label for="formGroupExampleInput2">Database</label> - <input type="text" name="db_database" class="form-control" value="{{.DbData}}" id="formGroupExampleInput2" value="statup" placeholder="Database name"> + <input type="text" name="db_database" class="form-control" value="{{.DbData}}" id="formGroupExampleInput2" placeholder="Database name"> </div> </div>