1
0
mirror of https://github.com/regclient/regclient.git synced 2025-04-18 22:44:00 +03:00

Version bump

- Alpine base image to v3.21.3
- Go image to latest commit
- ECR credential helper to latest commit
- docker/build-push-action to v6.14.0
- sigstore/cosign to v2.4.3
- sigstore/cosign-installer to v3.8.1
- github.com/klauspost/compress to v1.18.0
- github.com/spf13/cobra to v1.9.1

Signed-off-by: Brandon Mitchell <git@bmitch.net>
This commit is contained in:
Brandon Mitchell 2025-02-20 15:39:28 -05:00
parent fa3189e9d8
commit a603311c13
No known key found for this signature in database
GPG Key ID: 6E0FF28C767A8BEE
12 changed files with 45 additions and 46 deletions

View File

@ -29,7 +29,7 @@ jobs:
env:
ALPINE_NAME: "alpine:3"
ALPINE_DIGEST: "sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099" # 3.21.2
ALPINE_DIGEST: "sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c" # 3.21.3
steps:
- name: Check out code
@ -103,7 +103,7 @@ jobs:
password: ${{ secrets.GHCR_TOKEN }}
- name: Build
uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
uses: docker/build-push-action@0adf9959216b96bec444f325f1e493d4aa344497 # v6.14.0
id: build
with:
context: .
@ -119,9 +119,9 @@ jobs:
- name: Install cosign
if: github.event_name != 'pull_request' && github.repository_owner == 'regclient'
uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
with:
cosign-release: "v2.4.2"
cosign-release: "v2.4.3"
- name: Install syft
if: github.event_name != 'pull_request' && github.repository_owner == 'regclient'

View File

@ -71,9 +71,9 @@ jobs:
- name: Install cosign
if: ( startsWith( github.ref, 'refs/tags/v' ) || github.ref == 'refs/heads/main' ) && matrix.gover == env.RELEASE_GO_VER
uses: sigstore/cosign-installer@c56c2d3e59e4281cc41dea2217323ba5694b171e # v3.8.0
uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1
with:
cosign-release: "v2.4.2"
cosign-release: "v2.4.3"
- name: Package artifacts
if: ( startsWith( github.ref, 'refs/tags/v' ) || github.ref == 'refs/heads/main' ) && matrix.gover == env.RELEASE_GO_VER

View File

@ -1,15 +1,15 @@
{"name":"docker-arg-alpine-digest","key":"docker.io/library/alpine:3.21.2","version":"sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099"}
{"name":"docker-arg-alpine-tag","key":"docker.io/library/alpine","version":"3.21.2"}
{"name":"docker-arg-ecr","key":"https://github.com/awslabs/amazon-ecr-credential-helper.git:main","version":"076eb1fb9fa1f3a2fc1f7d2301c55a355921f643"}
{"name":"docker-arg-alpine-digest","key":"docker.io/library/alpine:3.21.3","version":"sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c"}
{"name":"docker-arg-alpine-tag","key":"docker.io/library/alpine","version":"3.21.3"}
{"name":"docker-arg-ecr","key":"https://github.com/awslabs/amazon-ecr-credential-helper.git:main","version":"ad1893c1a5ad94176c8b8003eb38b7d6f4aa4220"}
{"name":"docker-arg-gcr","key":"https://github.com/GoogleCloudPlatform/docker-credential-gcr.git","version":"v2.1.26"}
{"name":"docker-arg-go-digest","key":"docker.io/library/golang:1.24.0-alpine","version":"sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281"}
{"name":"docker-arg-go-digest","key":"docker.io/library/golang:1.24.0-alpine","version":"sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c"}
{"name":"docker-arg-go-tag","key":"docker.io/library/golang","version":"1.24.0"}
{"name":"docker-arg-lunajson","key":"https://github.com/grafi-tt/lunajson.git:master","version":"3d10600874527d71519b33ecbb314eb93ccd1df6"}
{"name":"docker-arg-semver","key":"https://github.com/kikito/semver.lua.git:master","version":"a4b708ba243208d46e575da870af969dca46a94d"}
{"name":"gha-alpine-digest","key":"docker.io/library/alpine:3.21.2","version":"sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099"}
{"name":"gha-alpine-digest","key":"docker.io/library/alpine:3.21.3","version":"sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c"}
{"name":"gha-alpine-tag-base","key":"docker.io/library/alpine","version":"3"}
{"name":"gha-alpine-tag-comment","key":"docker.io/library/alpine","version":"3.21.2"}
{"name":"gha-cosign-version","key":"https://github.com/sigstore/cosign.git","version":"v2.4.2"}
{"name":"gha-alpine-tag-comment","key":"docker.io/library/alpine","version":"3.21.3"}
{"name":"gha-cosign-version","key":"https://github.com/sigstore/cosign.git","version":"v2.4.3"}
{"name":"gha-golang-matrix","key":"golang-matrix","version":"[\"1.22\", \"1.23\", \"1.24\"]"}
{"name":"gha-golang-release","key":"golang-latest","version":"1.24"}
{"name":"gha-syft-version","key":"docker.io/anchore/syft","version":"v1.19.0"}
@ -18,21 +18,21 @@
{"name":"gha-uses-commit","key":"https://github.com/actions/stale.git:v9.1.0","version":"5bef64f19d7facfb25b37b414482c7164d639639"}
{"name":"gha-uses-commit","key":"https://github.com/actions/upload-artifact.git:v4.6.0","version":"65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08"}
{"name":"gha-uses-commit","key":"https://github.com/anchore/sbom-action.git:v0.18.0","version":"f325610c9f50a54015d37c8d16cb3b0e2c8f4de0"}
{"name":"gha-uses-commit","key":"https://github.com/docker/build-push-action.git:v6.13.0","version":"ca877d9245402d1537745e0e356eab47c3520991"}
{"name":"gha-uses-commit","key":"https://github.com/docker/build-push-action.git:v6.14.0","version":"0adf9959216b96bec444f325f1e493d4aa344497"}
{"name":"gha-uses-commit","key":"https://github.com/docker/login-action.git:v3.3.0","version":"9780b0c442fbb1117ed29e0efdff1e18412f7567"}
{"name":"gha-uses-commit","key":"https://github.com/docker/setup-buildx-action.git:v3.9.0","version":"f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca"}
{"name":"gha-uses-commit","key":"https://github.com/regclient/actions.git:main","version":"ce5fd131e371ffcdd7508b478cb223b3511a9183"}
{"name":"gha-uses-commit","key":"https://github.com/sigstore/cosign-installer.git:v3.8.0","version":"c56c2d3e59e4281cc41dea2217323ba5694b171e"}
{"name":"gha-uses-commit","key":"https://github.com/sigstore/cosign-installer.git:v3.8.1","version":"d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a"}
{"name":"gha-uses-commit","key":"https://github.com/softprops/action-gh-release.git:v2.2.1","version":"c95fe1489396fe8a9eb87c0abf8aa5b2ef267fda"}
{"name":"gha-uses-semver","key":"https://github.com/actions/checkout.git","version":"v4.2.2"}
{"name":"gha-uses-semver","key":"https://github.com/actions/setup-go.git","version":"v5.3.0"}
{"name":"gha-uses-semver","key":"https://github.com/actions/stale.git","version":"v9.1.0"}
{"name":"gha-uses-semver","key":"https://github.com/actions/upload-artifact.git","version":"v4.6.0"}
{"name":"gha-uses-semver","key":"https://github.com/anchore/sbom-action.git","version":"v0.18.0"}
{"name":"gha-uses-semver","key":"https://github.com/docker/build-push-action.git","version":"v6.13.0"}
{"name":"gha-uses-semver","key":"https://github.com/docker/build-push-action.git","version":"v6.14.0"}
{"name":"gha-uses-semver","key":"https://github.com/docker/login-action.git","version":"v3.3.0"}
{"name":"gha-uses-semver","key":"https://github.com/docker/setup-buildx-action.git","version":"v3.9.0"}
{"name":"gha-uses-semver","key":"https://github.com/sigstore/cosign-installer.git","version":"v3.8.0"}
{"name":"gha-uses-semver","key":"https://github.com/sigstore/cosign-installer.git","version":"v3.8.1"}
{"name":"gha-uses-semver","key":"https://github.com/softprops/action-gh-release.git","version":"v2.2.1"}
{"name":"go-mod-golang-release","key":"golang-oldest","version":"1.22"}
{"name":"makefile-ci-distribution","key":"docker.io/library/registry","version":"2.8.3"}
@ -47,6 +47,6 @@
{"name":"makefile-syft-container-tag","key":"anchore/syft","version":"v1.19.0"}
{"name":"makefile-syft-version","key":"docker.io/anchore/syft","version":"v1.19.0"}
{"name":"osv-golang-release","key":"docker.io/library/golang","version":"1.24.0"}
{"name":"shell-alpine-digest","key":"docker.io/library/alpine:3.21.2","version":"sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099"}
{"name":"shell-alpine-digest","key":"docker.io/library/alpine:3.21.3","version":"sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c"}
{"name":"shell-alpine-tag-base","key":"docker.io/library/alpine","version":"3"}
{"name":"shell-alpine-tag-comment","key":"docker.io/library/alpine","version":"3.21.2"}
{"name":"shell-alpine-tag-comment","key":"docker.io/library/alpine","version":"3.21.3"}

View File

@ -1,7 +1,7 @@
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
ARG GO_VER=1.24.0-alpine@sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c
ARG ECR_HELPER_VER=ad1893c1a5ad94176c8b8003eb38b7d6f4aa4220
ARG GCR_HELPER_VER=v2.1.26
ARG LUNAJSON_COMMIT=3d10600874527d71519b33ecbb314eb93ccd1df6
ARG SEMVER_COMMIT=a4b708ba243208d46e575da870af969dca46a94d

View File

@ -1,9 +1,9 @@
# syntax=docker/dockerfile:1
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
ARG GO_VER=1.24.0-alpine@sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c
ARG ECR_HELPER_VER=ad1893c1a5ad94176c8b8003eb38b7d6f4aa4220
ARG GCR_HELPER_VER=v2.1.26
ARG LUNAJSON_COMMIT=3d10600874527d71519b33ecbb314eb93ccd1df6
ARG SEMVER_COMMIT=a4b708ba243208d46e575da870af969dca46a94d

View File

@ -1,7 +1,7 @@
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
ARG GO_VER=1.24.0-alpine@sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c
ARG ECR_HELPER_VER=ad1893c1a5ad94176c8b8003eb38b7d6f4aa4220
ARG GCR_HELPER_VER=v2.1.26
FROM ${REGISTRY}/library/golang:${GO_VER} AS golang

View File

@ -1,9 +1,9 @@
# syntax=docker/dockerfile:1
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
ARG GO_VER=1.24.0-alpine@sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c
ARG ECR_HELPER_VER=ad1893c1a5ad94176c8b8003eb38b7d6f4aa4220
ARG GCR_HELPER_VER=v2.1.26
FROM --platform=$BUILDPLATFORM ${REGISTRY}/library/golang:${GO_VER} AS golang

View File

@ -1,7 +1,7 @@
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
ARG GO_VER=1.24.0-alpine@sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c
ARG ECR_HELPER_VER=ad1893c1a5ad94176c8b8003eb38b7d6f4aa4220
ARG GCR_HELPER_VER=v2.1.26
FROM ${REGISTRY}/library/golang:${GO_VER} AS golang

View File

@ -1,9 +1,9 @@
# syntax=docker/dockerfile:1
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
ARG GO_VER=1.24.0-alpine@sha256:2d40d4fc278dad38be0777d5e2a88a2c6dee51b0b29c97a764fc6c6a11ca893c
ARG ECR_HELPER_VER=ad1893c1a5ad94176c8b8003eb38b7d6f4aa4220
ARG GCR_HELPER_VER=v2.1.26
FROM --platform=$BUILDPLATFORM ${REGISTRY}/library/golang:${GO_VER} AS golang

View File

@ -7,7 +7,7 @@ base_name=""
release="scratch"
push_tags=""
ALPINE_NAME="alpine:3"
ALPINE_DIGEST="sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099" # 3.21.2
ALPINE_DIGEST="sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c" # 3.21.3
# CLI options to override image, platform, base digest, and comma separated list of tags to push
opt_c=0

4
go.mod
View File

@ -4,12 +4,12 @@ go 1.22
require (
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
github.com/klauspost/compress v1.17.11
github.com/klauspost/compress v1.18.0
github.com/olareg/olareg v0.1.2
github.com/opencontainers/go-digest v1.0.0
github.com/robfig/cron/v3 v3.0.1
github.com/sirupsen/logrus v1.9.3
github.com/spf13/cobra v1.8.1
github.com/spf13/cobra v1.9.1
github.com/ulikunitz/xz v0.5.12
github.com/yuin/gopher-lua v1.1.1
golang.org/x/sys v0.30.0

11
go.sum
View File

@ -1,4 +1,4 @@
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -6,8 +6,8 @@ github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 h1:UhxFibDNY/bfvqU
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
github.com/olareg/olareg v0.1.2 h1:75G8X6E9FUlzL/CSjgFcYfMgNzlc7CxULpUUNsZBIvI=
github.com/olareg/olareg v0.1.2/go.mod h1:TWs+N6pO1S4bdB6eerzUm/ITRQ6kw91mVf9ZYeGtw+Y=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@ -19,9 +19,8 @@ github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzG
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=