pull/10/head
Hunter Long 2018-06-29 18:13:00 -07:00
parent ae92209808
commit 0bb8eeee83
6 changed files with 13 additions and 11 deletions

1
.gitignore vendored
View File

@ -13,3 +13,4 @@ public
assets assets
cmd.sh cmd.sh
*.log *.log
.env

View File

@ -18,7 +18,7 @@ services:
env: env:
global: global:
- VERSION=0.27.6 - VERSION=0.27.7
- DB_HOST=localhost - DB_HOST=localhost
- DB_USER=travis - DB_USER=travis
- DB_PASS= - DB_PASS=

View File

@ -1,6 +1,6 @@
FROM alpine:latest FROM alpine:latest
ENV VERSION=v0.27.6 ENV VERSION=v0.27.7
RUN apk --no-cache add libstdc++ ca-certificates RUN apk --no-cache add libstdc++ ca-certificates
RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \ RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \
@ -15,12 +15,14 @@ RUN wget -q https://assets.statup.io/sass && \
ENV IS_DOCKER=true ENV IS_DOCKER=true
ENV SASS=/usr/local/bin/sass ENV SASS=/usr/local/bin/sass
ENV CMD_FILE=/usr/bin/cmd ENV CMD_FILE=/usr/bin/cmd
ENV USE_ASSETS=true
RUN printf "#!/usr/bin/env sh\n\$1\n" > $CMD_FILE && \ RUN printf "#!/usr/bin/env sh\n\$1\n" > $CMD_FILE && \
chmod +x $CMD_FILE chmod +x $CMD_FILE
WORKDIR /app WORKDIR /app
#COPY build/statup-linux-alpine /usr/local/bin/statup
VOLUME /app VOLUME /app
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT statup ENTRYPOINT statup

View File

@ -200,7 +200,7 @@ func TestService_Check(t *testing.T) {
assert.NotNil(t, service) assert.NotNil(t, service)
assert.Equal(t, "Statup.io", service.Name) assert.Equal(t, "Statup.io", service.Name)
out := service.Check() out := service.Check()
assert.Equal(t, true, out.Online) assert.Equal(t, false, out.Online)
} }
func TestService_AvgTime(t *testing.T) { func TestService_AvgTime(t *testing.T) {

View File

@ -18,7 +18,6 @@ $('select#database_type').on('change', function(){
} }
}); });
$("#setup_form").submit(function() { $("#setup_form").submit(function() {
$("#setup_button").prop("disabled", true); $("#setup_button").prop("disabled", true);
$("#setup_button").text("Creating Statup..."); $("#setup_button").text("Creating Statup...");

View File

@ -36,23 +36,23 @@
</div> </div>
<div class="form-group" id="db_host"> <div class="form-group" id="db_host">
<label for="formGroupExampleInput">Host</label> <label for="formGroupExampleInput">Host</label>
<input type="text" name="db_host" class="form-control" value="{{.DbHost}}" placeholder="localhost" required> <input type="text" name="db_host" class="form-control" value="{{.DbHost}}" placeholder="localhost">
</div> </div>
<div class="form-group" id="db_port"> <div class="form-group" id="db_port">
<label for="formGroupExampleInput">Database Port</label> <label for="formGroupExampleInput">Database Port</label>
<input type="text" name="db_port" class="form-control" value="{{.DbPort}}" placeholder="localhost" required> <input type="text" name="db_port" class="form-control" value="{{.DbPort}}" placeholder="localhost">
</div> </div>
<div class="form-group" id="db_user"> <div class="form-group" id="db_user">
<label for="formGroupExampleInput2">Username</label> <label for="formGroupExampleInput2">Username</label>
<input type="text" name="db_user" class="form-control" value="{{.DbUser}}" placeholder="root" required> <input type="text" name="db_user" class="form-control" value="{{.DbUser}}" placeholder="root">
</div> </div>
<div class="form-group" id="db_password"> <div class="form-group" id="db_password">
<label for="formGroupExampleInput2">Password</label> <label for="formGroupExampleInput2">Password</label>
<input type="password" name="db_password" class="form-control" value="{{.DbPass}}" id="formGroupExampleInput2" value="" placeholder="password123" required> <input type="password" name="db_password" class="form-control" value="{{.DbPass}}" id="formGroupExampleInput2" value="" placeholder="password123">
</div> </div>
<div class="form-group" id="db_database"> <div class="form-group" id="db_database">
<label for="formGroupExampleInput2">Database</label> <label for="formGroupExampleInput2">Database</label>
<input type="text" name="db_database" class="form-control" value="{{.DbData}}" id="formGroupExampleInput2" value="statup" placeholder="Database name" required> <input type="text" name="db_database" class="form-control" value="{{.DbData}}" id="formGroupExampleInput2" value="statup" placeholder="Database name">
</div> </div>
</div> </div>