From 5d035275d13cc9f315aa435e578e91e1cc543d79 Mon Sep 17 00:00:00 2001 From: Alexander Mankuta Date: Fri, 17 Nov 2017 14:59:21 +0200 Subject: [PATCH] Make sure version is properly set on CI --- Dockerfile | 7 ++++--- Makefile | 10 +--------- bin/update | 15 --------------- engine.json | 2 +- 4 files changed, 6 insertions(+), 28 deletions(-) delete mode 100755 bin/update diff --git a/Dockerfile b/Dockerfile index 64b5c80..d7c5161 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,14 +6,15 @@ 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) && \ + cat engine.json | jq '.version = .version + "/" + env.golint_version' > /engine.json && \ apk del .dev-deps && \ rm -rf "$GOPATH" diff --git a/Makefile b/Makefile index 2dfd021..eb90861 100644 --- 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 deleted file mode 100755 index 4d33c7a..0000000 --- a/bin/update +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -set -e - -apk add --no-cache curl jq -head_sha=$( - curl -s $( - curl -s "https://api.github.com/repos/golang/lint/git/refs/heads/master" | - jq -r .object.url - ) | - jq -r .sha -) -full_version="$(jq -r .version /engine.json | cut -d / -f 1)/${head_sha}" -jq ".version=\"${full_version}\"" /engine.json > /tmp/engine.json && - cat /tmp/engine.json > /engine.json diff --git a/engine.json b/engine.json index 4633a5f..b0060f4 100644 --- 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" }