From 2e8ba99663ee10d61c834ced50945351b2664595 Mon Sep 17 00:00:00 2001 From: Yann Hamon Date: Thu, 9 May 2024 15:15:13 +0200 Subject: [PATCH] Update go and base images --- Dockerfile | 2 +- Dockerfile-alpine | 2 +- Makefile | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5414f81..4209c77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18.3 as certs +FROM alpine:3.19.1 as certs RUN apk add ca-certificates FROM scratch AS kubeconform diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 9f64b16..e314c0d 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -1,4 +1,4 @@ -FROM alpine:3.18.3 +FROM alpine:3.19.1 LABEL org.opencontainers.image.authors="Yann Hamon " \ org.opencontainers.image.source="https://github.com/yannh/kubeconform/" \ org.opencontainers.image.description="A Kubernetes manifests validation tool" \ diff --git a/Makefile b/Makefile index 6e34f64..229248f 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.21.4 make local-test + docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.3 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.21.4 make local-build + docker run -t -v $$PWD:/go/src/github.com/yannh/kubeconform -w /go/src/github.com/yannh/kubeconform golang:1.22.3 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.21.4 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.3 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.22.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:v1.25.1 build --single-target --skip-post-hooks --rm-dist --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.22.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:v1.25.1 release --rm-dist update-deps: go get -u ./...