From 9652a4c1210dc288558b1e6b765516fe0a0a7ee6 Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Tue, 17 Mar 2020 11:35:50 +0100 Subject: [PATCH 1/2] Add license headers and check Signed-off-by: Christopher Crone --- ci/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/Dockerfile b/ci/Dockerfile index 8c14b43..1c0ca5a 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -18,6 +18,7 @@ WORKDIR /go/src ARG GOLANGCILINT_VERSION=v1.24.0 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANGCILINT_VERSION} +RUN go get -v -u github.com/kunalkushwaha/ltag && rm -rf /go/src/github.com/kunalkushwaha ENV GOFLAGS=-mod=vendor COPY . . From 7fc66498b94580fc2e5bd6ec554d6dd25caa57fb Mon Sep 17 00:00:00 2001 From: Christopher Crone Date: Thu, 26 Mar 2020 15:04:41 +0100 Subject: [PATCH 2/2] Output built binary in bin/ Signed-off-by: Christopher Crone --- .dockerignore | 1 + Makefile | 3 ++- scripts/validate/fileheader | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..e660fd9 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +bin/ diff --git a/Makefile b/Makefile index f4e2f08..697091a 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ GOFLAGS=-mod=vendor .PHONY: build build: ## Build compose-ref binary - GOPRIVATE=$(PACKAGE) GOFLAGS=$(GOFLAGS) go build compose-ref.go + @mkdir -p bin/ + GOPRIVATE=$(PACKAGE) GOFLAGS=$(GOFLAGS) go build -o bin/compose-ref compose-ref.go .PHONY: test test: ## Run tests diff --git a/scripts/validate/fileheader b/scripts/validate/fileheader index 5144210..1d3f564 100755 --- a/scripts/validate/fileheader +++ b/scripts/validate/fileheader @@ -25,4 +25,4 @@ fi BASEPATH="${1-}" -ltag -t "${BASEPATH}scripts/validate/template" --excludes "validate vendor" --check -v +ltag -t "${BASEPATH}scripts/validate/template" --excludes "bin validate vendor" --check -v