Merge pull request #99 from servian/swagger-up

Swagger up

Author: tristanmorgan

.circleci/config.yml

@@ -28,7 +28,7 @@ jobs:
           name: Setup
           command: |
             go get -v -t -d ./...
-            go get github.com/GeertJohan/go.rice/rice
+            go install github.com/GeertJohan/go.rice/rice@latest
             mkdir output
             go build -ldflags="-s -w" -a -v -o TechChallengeApp .
             ls
@@ -158,7 +158,7 @@ jobs:
             export tagvalue=$(git tag | grep ${version})
             export prerelease=$(echo ${version} | grep 'pre-release')
             if [ -z "${tagvalue}" ]; then
-              go get github.com/tcnksm/ghr
+              go install github.com/tcnksm/ghr@latest
 
               if [ -z "${prerelease}" ]; then
                 echo "No pre-release in version, creating release"

Dockerfile

@@ -2,30 +2,25 @@ FROM golang:alpine AS build
 
 RUN apk add --no-cache curl git alpine-sdk
 
-ARG SWAGGER_UI_VERSION=3.20.9
+ARG SWAGGER_UI_VERSION=4.8.0
 
-RUN dir=$(mktemp -d) \
-    && git clone https://github.com/go-swagger/go-swagger "$dir" \
-    && cd "$dir" \
-    && go install ./cmd/swagger \
-    && curl -sfL https://github.com/swagger-api/swagger-ui/archive/v$SWAGGER_UI_VERSION.tar.gz | tar xz -C /tmp/ \
+RUN curl -sfL https://github.com/swagger-api/swagger-ui/archive/v$SWAGGER_UI_VERSION.tar.gz | tar xz -C /tmp/ \
     && mv /tmp/swagger-ui-$SWAGGER_UI_VERSION /tmp/swagger \
     && sed -i 's#"https://petstore\.swagger\.io/v2/swagger\.json"#"./swagger.json"#g' /tmp/swagger/dist/index.html
 
-RUN go get github.com/GeertJohan/go.rice/rice
+RUN go install github.com/go-swagger/go-swagger/cmd/swagger@latest
+RUN go install github.com/GeertJohan/go.rice/rice@latest
 
 WORKDIR $GOPATH/src/github.com/servian/TechChallengeApp
 
-COPY go.mod go.sum $GOPATH/src/github.com/servian/TechChallengeApp/
+COPY . .
 
 RUN go mod tidy
 
-COPY . .
-
 RUN CGO_ENABLED="0" go build -ldflags="-s -w" -a -o /TechChallengeApp
 RUN swagger generate spec -o /swagger.json \
  && cp /swagger.json ui/assets/swagger/ \
- && cp -R /tmp/swagger/dist ui/assets/swagger
+ && cp -R /tmp/swagger/dist/* ui/assets/swagger
 
 RUN cd ui && rice append --exec /TechChallengeApp
 

ui/index.go

@@ -21,6 +21,7 @@
 package ui
 
 import (
+	"expvar"
 	"fmt"
 	"net/http"
 
@@ -76,5 +77,6 @@ func uiHandler(cfg Config, router *mux.Router) {
 	router.Handle("/css/{path:.*}", staticFileServer)
 	router.Handle("/images/{path:.*}", staticFileServer)
 	router.Handle("/swagger/{path:.*}", staticFileServer)
+	router.Handle("/metrics", expvar.Handler())
 	router.Handle("/", indexHandler())
 }