todaywasawesome
diff --git a/‎Dockerfile
Lines changed: 19 additions & 14 deletions b/‎Dockerfile
Lines changed: 19 additions & 14 deletions
diff --git a/‎app.go
Lines changed: 8 additions & 24 deletions b/‎app.go
Lines changed: 8 additions & 24 deletions
diff --git a/‎source-code-canary/go.mod renamed to ‎go.mod b/‎source-code-canary/go.mod renamed to ‎go.mod
diff --git a/‎source-code-canary/Dockerfile
Lines changed: 0 additions & 20 deletions b/‎source-code-canary/Dockerfile
Lines changed: 0 additions & 20 deletions
diff --git a/‎source-code-canary/app.go
Lines changed: 0 additions & 23 deletions b/‎source-code-canary/app.go
Lines changed: 0 additions & 23 deletions
diff --git a/‎source-code-canary/static/favicon.png renamed to ‎static/favicon.png b/‎source-code-canary/static/favicon.png renamed to ‎static/favicon.png
diff --git a/‎source-code-canary/static/index.html renamed to ‎static/index.html b/‎source-code-canary/static/index.html renamed to ‎static/index.html
diff --git a/‎source-code-canary/static/style.css renamed to ‎static/style.css b/‎source-code-canary/static/style.css renamed to ‎static/style.css
@@ -1,15 +1,20 @@
-#build stage
-FROM golang:1.10.3-alpine AS build-env
-ENV GOPROXY=https://gocenter.io 
-ADD . /src
-RUN cd /src && go build -o myapp
-
-# iron/go is the alpine image with only ca-certificates added
-FROM alpine
-#RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.1/main' >> /etc/apk/repositories
-#RUN apk add "openssh==6.7_p1-r6"
-#added just to get security vulnerabilities in
-# RUN apk add openssh 
+FROM golang:1.16-alpine3.13 AS build-env
+
+WORKDIR /tmp/workdir
+
+COPY . .
+
+RUN CGO_ENABLED=0 GOOS=linux go build 
+
+FROM alpine:3.13
+
+EXPOSE 8080
+
+RUN apk add --no-cache ca-certificates bash
+
+COPY --from=build-env /tmp/workdir/static /app/static
+COPY --from=build-env /tmp/workdir/canary-app /app/canary-app
+
 WORKDIR /app
-COPY --from=build-env /src/myapp /app/
-ENTRYPOINT ["./myapp"]
+
+CMD ["./canary-app"]
@@ -1,39 +1,23 @@
 package main
- 
+
 import (
-	"os"
 	"fmt"
 	"net/http"
-	// "github.com/golangci/golangci-lint/pkg/exitcodes"
 )
 
 func main() {
 
-	//Add a GPL3 package to cause havock 
-	// os.Setenv("test", string(exitcodes.Success))
-
+	version := "1.0"
 
-	c := os.Getenv("COLOR")
-	if len(c) == 0{
-		// os.Setenv("COLOR", "#44B3C2") //Blue 44B3C2 and Yellow F1A94E  
-		os.Setenv("COLOR", "#F1A94E") //Blue 44B3C2 and Yellow F1A94E  
-	}  
+	color := "#44B3C2" //Blue 44B3C2 and Yellow F1A94E
 
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "<html onclick=\"window.location.href = '/die'\" style='background:" + os.Getenv("COLOR") + "'> Requested: %s\n </html>", r.URL.Path)
+	http.HandleFunc("/callme", func(w http.ResponseWriter, r *http.Request) {
+		fmt.Fprintf(w, "<div class='pod' style='background:%s'> ver: %s\n </div>", color, version)
 	})
 
-	http.HandleFunc("/dashboard", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "<html> DASHBOARD Requested: %s\n </html>", r.URL.Path)
-	})
-
-	http.HandleFunc("/die", func(w http.ResponseWriter, r *http.Request) {
-		die();
-	})
+	fs := http.FileServer(http.Dir("./static"))
+	http.Handle("/", fs)
 
+	fmt.Println("Listening now at port 8080")
 	http.ListenAndServe(":8080", nil)
 }
-
-func die() {
-	os.Exit(3)
-}