From 1bd44986dd3d281725afab6b173770ec86b454fc Mon Sep 17 00:00:00 2001 From: Yann Hamon Date: Tue, 30 Jul 2024 23:34:40 +0200 Subject: [PATCH] Update some dependencies (#283) --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- Dockerfile.bats | 2 +- Makefile | 10 +++++----- go.mod | 6 ++---- go.sum | 10 ++++++++++ 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4209c77..08a64e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.19.1 as certs +FROM alpine:3.20.2 as certs RUN apk add ca-certificates FROM scratch AS kubeconform diff --git a/Dockerfile-alpine b/Dockerfile-alpine index d810cf9..cb0dd89 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM alpine:3.19.1 +FROM alpine:3.20.2 LABEL org.opencontainers.image.authors="Yann Hamon " \ org.opencontainers.image.source="https://github.com/yannh/kubeconform/" \ diff --git a/Dockerfile.bats b/Dockerfile.bats index 964b39b..181743b 100644 --- a/Dockerfile.bats +++ b/Dockerfile.bats @@ -1,4 +1,4 @@ -FROM bats/bats:v1.2.1 +FROM bats/bats:1.11.0 RUN apk --no-cache add ca-certificates parallel libxml2-utils COPY dist/kubeconform_linux_amd64_v1/kubeconform /code/bin/ COPY acceptance.bats acceptance-nonetwork.bats /code/ diff --git a/Makefile b/Makefile index ba5e685..f4c5f49 100644 --- a/Makefile +++ b/Makefile @@ -16,13 +16,13 @@ local-build-static: # These only used for development. Release artifacts and docker images are produced by goreleaser. docker-test: - docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.1 make local-test + docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.5 make local-test docker-build: - docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.1 make local-build + docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.5 make local-build docker-build-static: - docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.1 make local-build-static + docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.5 make local-build-static build-bats: docker build -t bats -f Dockerfile.bats . @@ -32,11 +32,11 @@ docker-acceptance: build-bats docker run --network none -t bats -p acceptance-nonetwork.bats goreleaser-build-static: - docker run -t -e GOOS=linux -e GOARCH=amd64 -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform goreleaser/goreleaser:v1.25.1 build --single-target --skip-post-hooks --rm-dist --snapshot + docker run -t -e GOOS=linux -e GOARCH=amd64 -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform goreleaser/goreleaser:v2.1.0 build --clean --single-target --snapshot cp dist/kubeconform_linux_amd64_v1/kubeconform bin/ release: - docker run -e GITHUB_TOKEN -e GIT_OWNER -t -v /var/run/docker.sock:/var/run/docker.sock -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform goreleaser/goreleaser:v1.25.1 release --rm-dist + docker run -e GITHUB_TOKEN -e GIT_OWNER -t -v /var/run/docker.sock:/var/run/docker.sock -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform goreleaser/goreleaser:v2.1.0 release --clean update-deps: go get -u ./... diff --git a/go.mod b/go.mod index fb892ad..22d39fc 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,9 @@ module github.com/yannh/kubeconform go 1.22 require ( + github.com/hashicorp/go-retryablehttp v0.7.7 github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 sigs.k8s.io/yaml v1.4.0 ) -require ( - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-retryablehttp v0.7.7 // indirect -) +require github.com/hashicorp/go-cleanhttp v0.5.2 // indirect diff --git a/go.sum b/go.sum index 4113063..1b63a1b 100644 --- a/go.sum +++ b/go.sum @@ -1,11 +1,21 @@ +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4= github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=