From 727f5fe57e26eec858d2fe4a05cc8be1f6b5ffca Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Tue, 17 Aug 2021 01:31:46 -0400 Subject: [PATCH 1/2] build: bump to use go1.17 Signed-off-by: Rui Chen --- Dockerfile | 4 ++-- Makefile | 6 +++--- go.mod | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a74d48..43f996c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM alpine:latest as certs +FROM alpine:3.14 as certs RUN apk add ca-certificates FROM scratch AS kubeconform MAINTAINER Yann HAMON COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY bin/kubeconform / -ENTRYPOINT ["/kubeconform"] \ No newline at end of file +ENTRYPOINT ["/kubeconform"] diff --git a/Makefile b/Makefile index 5e7aace..979d499 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ build-static: CGO_ENABLED=0 GOFLAGS=-mod=vendor GOOS=linux GOARCH=amd64 GO111MODULE=on go build -trimpath -tags=netgo -ldflags "-extldflags=\"-static\"" -a -o bin/ ./... docker-test: - docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.16 make test + docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.17 make test docker-build-static: - docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.16 make build-static + docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.17 make build-static build-bats: docker build -t bats -f Dockerfile.bats . @@ -43,4 +43,4 @@ release: update-deps: go get -u ./... - go mod tidy \ No newline at end of file + go mod tidy diff --git a/go.mod b/go.mod index a39c3a0..f3a8442 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/yannh/kubeconform -go 1.16 +go 1.17 require ( github.com/beevik/etree v1.1.0 @@ -9,3 +9,5 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect sigs.k8s.io/yaml v1.2.0 ) + +require github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect From cf50a6c9da1ad5a41a333eaf55eba8046caf131b Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sun, 22 Aug 2021 02:15:34 -0400 Subject: [PATCH 2/2] merge require blocks Signed-off-by: Rui Chen --- go.mod | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/go.mod b/go.mod index f3a8442..84635b4 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,8 @@ go 1.17 require ( github.com/beevik/etree v1.1.0 github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 gopkg.in/yaml.v2 v2.4.0 // indirect sigs.k8s.io/yaml v1.2.0 ) - -require github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect