4 files changed, 25 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 98e6ef6..2aa56f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.db
+belverde-fire
diff --git a/Containerfile b/Containerfile
new file mode 100644
index 0000000..2554194
--- /dev/null
+++ b/Containerfile
@@ -0,0 +1,4 @@
+FROM alpine:latest
+WORKDIR /app
+COPY belverde-fire .
+ENTRYPOINT ["/app/belverde-fire"]
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..ffc3cde
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+CGO_ENABLED=0 go build . || exit 1
+docker build -t git.d464.sh/diogo464/belverde-fire -f Containerfile . || exit 1
+
+if [ "$PUSH" = "1" ]; then
+        docker push git.d464.sh/diogo464/belverde-fire
+fi
+
diff --git a/main.go b/main.go
index f30496f..2adaa21 100644
--- a/main.go
+++ b/main.go
@@ -19,6 +19,11 @@ import (
         "github.com/pkg/errors"
 )
 
+const (
+        ENV_VAR_HTTP_USERNAME = "HTTP_USERNAME"
+        ENV_VAR_HTTP_PASSWORD = "HTTP_PASSWORD"
+)
+
 type LocationLog struct {
         Timestamp float64 `json:"timestamp"`
         Latitude  float64 `json:"latitude"`
@@ -220,8 +225,8 @@ func handlePostApiShapes(w http.ResponseWriter, r *http.Request) {
 func requireBasicAuth(h http.HandlerFunc) http.HandlerFunc {
         return func(w http.ResponseWriter, r *http.Request) {
                 username, password, ok := r.BasicAuth()
-                required_username := os.Getenv("HTTP_USERNAME")
-                required_password := os.Getenv("HTTP_PASSWORD")
+                required_username := os.Getenv(ENV_VAR_HTTP_USERNAME)
+                required_password := os.Getenv(ENV_VAR_HTTP_PASSWORD)
                 if !ok || username != required_username || password != required_password {
                         w.Header().Add("WWW-Authenticate", "Basic realm=\"User Visible Realm\"")
                         http.Error(w, "invalid authentication", http.StatusUnauthorized)
@@ -255,6 +260,10 @@ func main() {
                 log.Fatal(err)
         }
 
+        if os.Getenv(ENV_VAR_HTTP_USERNAME) == "" || os.Getenv(ENV_VAR_HTTP_PASSWORD) == "" {
+                log.Fatalf("http username and password cannot be empty")
+        }
+
         http.HandleFunc("GET /api/location", handleGetApiLog)
         http.HandleFunc("POST /api/location", requireBasicAuth(handlePostApiLog))
         http.HandleFunc("GET /api/shapes", handleGetApiShapes)