Merge pull request #26 from Financial-Times/feature/pac-categories

Added annotations-curation category for PAC + dep

.circleci/config.yml

@@ -3,39 +3,37 @@ jobs:
   build:
     working_directory: /go/src/github.com/Financial-Times/upp-aggregate-healthcheck
     docker:
-      - image: golang:1.8.3
-        environment:
-          GOPATH: /go
-          CIRCLE_TEST_REPORTS: /tmp/test-results
-          CIRCLE_COVERAGE_REPORT: /tmp/coverage-results
+      - image: circleci/golang:1.9
+    environment:
+      CIRCLE_TEST_REPORTS: /tmp/test-results
+      CIRCLE_COVERAGE_REPORT: /tmp/coverage-results
     steps:
       - checkout
+      - run:
+          name: Make go get work
+          command: sudo chown -R circleci:circleci /go/src
       - run:
           name: External Dependencies
           command: |
+            go get -u github.com/golang/dep/cmd/dep
             go get -u github.com/mattn/goveralls
             go get -u github.com/jstemmer/go-junit-report
-            go get -u github.com/kardianos/govendor
-            go get -u github.com/haya14busa/goverage
       - run:
-          name: Test Results
-          command: |
-            mkdir -p ${CIRCLE_TEST_REPORTS}
-            mkdir -p ${CIRCLE_COVERAGE_REPORT}
-      - run:
-          name: Govendor Sync
-          command: govendor sync -v
+          name: Import libraries
+          command: dep ensure
       - run:
           name: Go Build
           command: go build -v
       - run:
           name: Run Tests
           command: |
-            govendor test -race -v +local | /go/bin/go-junit-report > ${CIRCLE_TEST_REPORTS}/main.xml
-            goverage -covermode=atomic -race -coverprofile=${CIRCLE_COVERAGE_REPORT}/coverage.out ./...
+            mkdir -p ${CIRCLE_TEST_REPORTS}/golang
+            mkdir -p ${CIRCLE_COVERAGE_REPORT}
+            go test -race -v | go-junit-report > $CIRCLE_TEST_REPORTS/golang/junit.xml
+            go test -race -cover -coverprofile=$CIRCLE_COVERAGE_REPORT/coverage.out
       - run:
           name: Upload Coverage
-          command: /go/bin/goveralls -coverprofile=${CIRCLE_COVERAGE_REPORT}/coverage.out -service=circle-ci -repotoken=$COVERALLS_TOKEN
+          command: goveralls -coverprofile=${CIRCLE_COVERAGE_REPORT}/coverage.out -service=circle-ci -repotoken=$COVERALLS_TOKEN
       - store_test_results:
           path: /tmp/test-results
   dockerfile:

.gitignore

@@ -1,5 +1,5 @@
 /upp-aggregate-healthcheck
-vendor/*/
+vendor/
 *.idea
 *.exe
 /.project

Dockerfile

@@ -1,23 +1,34 @@
-FROM golang:1.7-alpine3.5
+FROM golang:1.9-alpine
 
-RUN mkdir -p /upp-aggregate-healthcheck
-
-ADD . "$GOPATH/src/upp-aggregate-healthcheck"
+ENV PROJECT=upp-aggregate-healthcheck
+COPY . /${PROJECT}-sources/
 
 RUN apk --no-cache --virtual .build-dependencies add git \
-  && cd $GOPATH/src/upp-aggregate-healthcheck \
-  && go get -u github.com/kardianos/govendor \
-  && $GOPATH/bin/govendor sync \
-  && go-wrapper download \
-  && go-wrapper install \
-  && ls -la $GOPATH \
-  && cp -R resources /upp-aggregate-healthcheck/ \
-  && cp -R html-templates /upp-aggregate-healthcheck/ \
+  && ORG_PATH="github.com/Financial-Times" \
+  && REPO_PATH="Financial-Times/${PROJECT}" \
+  && mkdir -p $GOPATH/src/Financial-Times \
+  # Linking the project sources in the GOPATH folder
+  && ln -s /${PROJECT}-sources $GOPATH/src/${REPO_PATH} \
+  && cd $GOPATH/src/${REPO_PATH} \
+  && BUILDINFO_PACKAGE="Financial-Times/${PROJECT}/vendor/Financial-Times/service-status-go/buildinfo." \
+  && VERSION="version=$(git describe --tag --always 2> /dev/null)" \
+  && DATETIME="dateTime=$(date -u +%Y%m%d%H%M%S)" \
+  && REPOSITORY="repository=$(git config --get remote.origin.url)" \
+  && REVISION="revision=$(git rev-parse HEAD)" \
+  && BUILDER="builder=$(go version)" \
+  && LDFLAGS="-X '"${BUILDINFO_PACKAGE}$VERSION"' -X '"${BUILDINFO_PACKAGE}$DATETIME"' -X '"${BUILDINFO_PACKAGE}$REPOSITORY"' -X '"${BUILDINFO_PACKAGE}$REVISION"' -X '"${BUILDINFO_PACKAGE}$BUILDER"'" \
+  && echo "Build flags: $LDFLAGS" \
+  && echo "Fetching dependencies..." \
+  && go get -u github.com/golang/dep/cmd/dep \
+  && $GOPATH/bin/dep ensure \
+  && go build -ldflags="${LDFLAGS}" \
+  && mv ${PROJECT} /${PROJECT} \
+  && mv /${PROJECT}-sources/resources /resources \
+  && mv /${PROJECT}-sources/html-templates /html-templates \
+  && rm -r /${PROJECT}-sources \
   && apk del .build-dependencies \
-  && rm -rf $GOPATH/src $GOPATH/pkg
-
-WORKDIR /upp-aggregate-healthcheck
+  && rm -rf $GOPATH /var/cache/apk/*
 
-EXPOSE 8080
+WORKDIR /
 
-CMD ["go-wrapper", "run"]
+CMD [ "/upp-aggregate-healthcheck" ]