Skip to content

Commit

Permalink
new
Browse files Browse the repository at this point in the history
  • Loading branch information
hunterlong committed Jun 30, 2018
1 parent ae92209 commit 0bb8eee
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ dart-sass
public
assets
cmd.sh
*.log
*.log
.env
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:

env:
global:
- VERSION=0.27.6
- VERSION=0.27.7
- DB_HOST=localhost
- DB_USER=travis
- DB_PASS=
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:latest

ENV VERSION=v0.27.6
ENV VERSION=v0.27.7

RUN apk --no-cache add libstdc++ ca-certificates
RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \
Expand All @@ -15,12 +15,14 @@ RUN wget -q https://assets.statup.io/sass && \
ENV IS_DOCKER=true
ENV SASS=/usr/local/bin/sass
ENV CMD_FILE=/usr/bin/cmd
ENV USE_ASSETS=true

RUN printf "#!/usr/bin/env sh\n\$1\n" > $CMD_FILE && \
chmod +x $CMD_FILE

WORKDIR /app
#COPY build/statup-linux-alpine /usr/local/bin/statup

VOLUME /app

EXPOSE 8080
ENTRYPOINT statup
2 changes: 1 addition & 1 deletion main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func TestService_Check(t *testing.T) {
assert.NotNil(t, service)
assert.Equal(t, "Statup.io", service.Name)
out := service.Check()
assert.Equal(t, true, out.Online)
assert.Equal(t, false, out.Online)
}

func TestService_AvgTime(t *testing.T) {
Expand Down
1 change: 0 additions & 1 deletion source/js/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ $('select#database_type').on('change', function(){
}
});


$("#setup_form").submit(function() {
$("#setup_button").prop("disabled", true);
$("#setup_button").text("Creating Statup...");
Expand Down
10 changes: 5 additions & 5 deletions source/tmpl/setup.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,23 @@
</div>
<div class="form-group" id="db_host">
<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 class="form-group" id="db_port">
<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 class="form-group" id="db_user">
<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 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" required>
<input type="password" name="db_password" class="form-control" value="{{.DbPass}}" id="formGroupExampleInput2" value="" 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" required>
<input type="text" name="db_database" class="form-control" value="{{.DbData}}" id="formGroupExampleInput2" value="statup" placeholder="Database name">
</div>

</div>
Expand Down

0 comments on commit 0bb8eee

Please sign in to comment.