Make sure version is properly set on CI

codeclimate · Jan 10, 2018 · 1dc6f84 · 1dc6f84
1 parent c38edbf
commit 1dc6f84
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 28 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,14 +6,16 @@ RUN adduser -u 9000 -D app
 
 WORKDIR /usr/src/app
 
-COPY engine.json /engine.json
-COPY codeclimate-golint.go /usr/src/app/codeclimate-golint.go
+COPY engine.json codeclimate-golint.go ./
 
-RUN apk add --no-cache --virtual .dev-deps musl-dev go git && \
+RUN apk add --no-cache --virtual .dev-deps musl-dev go git jq && \
   export GOPATH=/tmp/go GOBIN=/usr/local/bin && \
   go get -d -t -v . && \
   export LIBRARY_PATH=/usr/lib32:$LIBRARY_PATH && \
   go install codeclimate-golint.go && \
+  export golint_version=$(cd "${GOPATH}/src/github.com/golang/lint/" && git rev-parse HEAD 2>/dev/null) && \
+  echo $golint_version && \
+  cat engine.json | jq '.version = .version + "/" + env.golint_version' > /engine.json && \
   apk del .dev-deps && \
   rm -rf "$GOPATH"
 

diff --git a/Makefile b/Makefile
@@ -2,13 +2,5 @@
 
 IMAGE_NAME ?= codeclimate/codeclimate-golint
 
-update:
-	docker run \
-	  --rm --interactive \
-	  -v $(PWD)/engine.json:/engine.json \
-	  -v $(PWD)/bin/update:/usr/local/bin/update \
-	  alpine:edge \
-	  /usr/local/bin/update
-
-image: update
+image:
 	docker build --rm -t $(IMAGE_NAME) .
diff --git a/bin/update b/bin/update
diff --git a/engine.json b/engine.json
@@ -8,6 +8,6 @@
   "languages": [
     "Go"
   ],
-  "version": "1.0.0/6aaf7c34af0f4c36a57e0c429bace4d706d8e931",
+  "version": "1.0.0",
   "spec_version": "0.3.1"
 }