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

Version bump including Go

Browse Source 
- Support for Go 1.21 is dropped, leaving 1.22 the minimum release
- Go base image to 1.24.0
- ECR helper to latest commit
- gosec to v2.22.1
- dominikh/go-tools for staticcheck to v0.6.0
- olareg/olareg to v0.1.2
- Fixing staticcheck linter warnings

Signed-off-by: Brandon Mitchell <git@bmitch.net>
This commit is contained in:
Brandon Mitchell 2025-02-14 10:57:01 -05:00
parent 796a9bd489
commit fd60a24198
No known key found for this signature in database
GPG Key ID: 6E0FF28C767A8BEE
15 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-registry.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
env:
RELEASE_GO_VER: "1.23"
RELEASE_GO_VER: "1.24"
steps:
- name: Check out code

4
.github/workflows/go.yml vendored
View File

@ -19,10 +19,10 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
gover: ["1.21", "1.22", "1.23"]
gover: ["1.22", "1.23", "1.24"]
env:
RELEASE_GO_VER: "1.23"
RELEASE_GO_VER: "1.24"
# do not automatically upgrade go to a different version: https://go.dev/doc/toolchain
GOTOOLCHAIN: "local"

2
.github/workflows/vulnscans.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
name: Run vulnerability scans
runs-on: ubuntu-latest
env:
RELEASE_GO_VER: "1.23"
RELEASE_GO_VER: "1.24"
steps:
- name: Check out code

2
.osv-scanner.toml
View File

@ -1 +1 @@
GoVersionOverride = "1.23.6"
GoVersionOverride = "1.24.0"

18
.version-bump.lock
View File

@ -1,17 +1,17 @@
{"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":"6540026091fe97d68c5e653b754cac6a3f5937ee"}
{"name":"docker-arg-ecr","key":"https://github.com/awslabs/amazon-ecr-credential-helper.git:main","version":"076eb1fb9fa1f3a2fc1f7d2301c55a355921f643"}
{"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.23.6-alpine","version":"sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037"}
{"name":"docker-arg-go-tag","key":"docker.io/library/golang","version":"1.23.6"}
{"name":"docker-arg-go-digest","key":"docker.io/library/golang:1.24.0-alpine","version":"sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281"}
{"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-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-golang-matrix","key":"golang-matrix","version":"[\"1.21\", \"1.22\", \"1.23\"]"}
{"name":"gha-golang-release","key":"golang-latest","version":"1.23"}
{"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"}
{"name":"gha-uses-commit","key":"https://github.com/actions/checkout.git:v4.2.2","version":"11bd71901bbe5b1630ceea73d27597364c9af683"}
{"name":"gha-uses-commit","key":"https://github.com/actions/setup-go.git:v5.3.0","version":"f111f3307d8850f501ac008e886eec1fd1932a34"}
@ -34,19 +34,19 @@
{"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/softprops/action-gh-release.git","version":"v2.2.1"}
{"name":"go-mod-golang-release","key":"golang-oldest","version":"1.21"}
{"name":"go-mod-golang-release","key":"golang-oldest","version":"1.22"}
{"name":"makefile-ci-distribution","key":"docker.io/library/registry","version":"2.8.3"}
{"name":"makefile-ci-zot","key":"ghcr.io/project-zot/zot-linux-amd64","version":"v2.1.2"}
{"name":"makefile-go-vulncheck","key":"https://go.googlesource.com/vuln.git","version":"v1.1.4"}
{"name":"makefile-gomajor","key":"https://github.com/icholy/gomajor.git","version":"v0.14.0"}
{"name":"makefile-gosec","key":"https://github.com/securego/gosec.git","version":"v2.22.0"}
{"name":"makefile-gosec","key":"https://github.com/securego/gosec.git","version":"v2.22.1"}
{"name":"makefile-markdown-lint","key":"docker.io/davidanson/markdownlint-cli2","version":"v0.17.2"}
{"name":"makefile-osv-scanner","key":"https://github.com/google/osv-scanner.git","version":"v1.9.2"}
{"name":"makefile-staticcheck","key":"https://github.com/dominikh/go-tools.git","version":"v0.5.1"}
{"name":"makefile-staticcheck","key":"https://github.com/dominikh/go-tools.git","version":"v0.6.0"}
{"name":"makefile-syft-container-digest","key":"anchore/syft:v1.19.0","version":"sha256:bc1ae555a43011d23bb011a4f50e175fc9a5984a008a3f8f2d692b211fcacd2a"}
{"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.23.6"}
{"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-tag-base","key":"docker.io/library/alpine","version":"3"}
{"name":"shell-alpine-tag-comment","key":"docker.io/library/alpine","version":"3.21.2"}

7
Makefile
View File

@ -35,7 +35,7 @@ ifeq "$(strip $(VER_BUMP))" ''
endif
MARKDOWN_LINT_VER?=v0.17.2
GOMAJOR_VER?=v0.14.0
GOSEC_VER?=v2.22.0
GOSEC_VER?=v2.22.1
GO_VULNCHECK_VER?=v1.1.4
OSV_SCANNER_VER?=v1.9.2
SYFT?=$(shell command -v syft 2>/dev/null)
@ -48,7 +48,7 @@ ifneq "$(SYFT_CMD_VER)" "$(SYFT_VERSION)"
-u "$(shell id -u):$(shell id -g)" \
$(SYFT_CONTAINER)
endif
STATICCHECK_VER?=v0.5.1
STATICCHECK_VER?=v0.6.0
CI_DISTRIBUTION_VER?=2.8.3
CI_ZOT_VER?=v2.1.2
@ -245,7 +245,8 @@ $(GOPATH)/bin/staticcheck: .FORCE
|| go install "honnef.co/go/tools/cmd/staticcheck@$(STATICCHECK_VER)"
$(GOPATH)/bin/govulncheck: .FORCE
@[ $$(go version -m $(GOPATH)/bin/govulncheck | \
@[ -f $(GOPATH)/bin/govulncheck ] \
&& [ $$(go version -m $(GOPATH)/bin/govulncheck | \
awk -F ' ' '{ if ($$1 == "mod" && $$2 == "golang.org/x/vuln") { printf "%s\n", $$3 } }') = "$(GO_VULNCHECK_VER)" ] \
|| CGO_ENABLED=0 go install "golang.org/x/vuln/cmd/govulncheck@$(GO_VULNCHECK_VER)"

4
build/Dockerfile.regbot
View File

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

4
build/Dockerfile.regbot.buildkit
View File

@ -2,8 +2,8 @@
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.23.6-alpine@sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037
ARG ECR_HELPER_VER=6540026091fe97d68c5e653b754cac6a3f5937ee
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG GCR_HELPER_VER=v2.1.26
ARG LUNAJSON_COMMIT=3d10600874527d71519b33ecbb314eb93ccd1df6
ARG SEMVER_COMMIT=a4b708ba243208d46e575da870af969dca46a94d

4
build/Dockerfile.regctl
View File

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

4
build/Dockerfile.regctl.buildkit
View File

@ -2,8 +2,8 @@
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.23.6-alpine@sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037
ARG ECR_HELPER_VER=6540026091fe97d68c5e653b754cac6a3f5937ee
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG GCR_HELPER_VER=v2.1.26
FROM --platform=$BUILDPLATFORM ${REGISTRY}/library/golang:${GO_VER} AS golang

4
build/Dockerfile.regsync
View File

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

4
build/Dockerfile.regsync.buildkit
View File

@ -2,8 +2,8 @@
ARG REGISTRY=docker.io
ARG ALPINE_VER=3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
ARG GO_VER=1.23.6-alpine@sha256:2c49857f2295e89b23b28386e57e018a86620a8fede5003900f2d138ba9c4037
ARG ECR_HELPER_VER=6540026091fe97d68c5e653b754cac6a3f5937ee
ARG GO_VER=1.24.0-alpine@sha256:5429efb7de864db15bd99b91b67608d52f97945837c7f6f7d1b779f9bfe46281
ARG ECR_HELPER_VER=076eb1fb9fa1f3a2fc1f7d2301c55a355921f643
ARG GCR_HELPER_VER=v2.1.26
FROM --platform=$BUILDPLATFORM ${REGISTRY}/library/golang:${GO_VER} AS golang

4
go.mod
View File

@ -1,11 +1,11 @@
module github.com/regclient/regclient
go 1.21
go 1.22
require (
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
github.com/klauspost/compress v1.17.11
github.com/olareg/olareg v0.1.1
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

4
go.sum
View File

@ -8,8 +8,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
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/olareg/olareg v0.1.1 h1:Ui7q93zjcoF+U9U71sgqgZWByDoZOpqHitUXEu2xV+g=
github.com/olareg/olareg v0.1.1/go.mod h1:w8NP4SWrHHtxsFaUiv1lnCnYPm4sN1seCd2h7FK/dc0=
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=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

8
types/ref/ref.go
View File

@ -72,7 +72,7 @@ func New(parse string) (Ref, error) {
case "":
ret.Scheme = "reg"
matchRef := refRE.FindStringSubmatch(tail)
if matchRef == nil || len(matchRef) < 5 {
if len(matchRef) < 5 {
if refRE.FindStringSubmatch(strings.ToLower(tail)) != nil {
return Ref{}, fmt.Errorf("%w \"%s\", repo must be lowercase", errs.ErrInvalidReference, tail)
}
@ -105,7 +105,7 @@ func New(parse string) (Ref, error) {
case "ocidir", "ocifile":
matchPath := ocidirRE.FindStringSubmatch(tail)
if matchPath == nil || len(matchPath) < 2 || matchPath[1] == "" {
if len(matchPath) < 2 || matchPath[1] == "" {
return Ref{}, fmt.Errorf("%w, invalid path for scheme \"%s\": %s", errs.ErrInvalidReference, scheme, tail)
}
ret.Path = matchPath[1]
@ -140,7 +140,7 @@ func NewHost(parse string) (Ref, error) {
case "":
ret.Scheme = "reg"
matchReg := registryRE.FindStringSubmatch(tail)
if matchReg == nil || len(matchReg) < 2 {
if len(matchReg) < 2 {
return Ref{}, fmt.Errorf("%w \"%s\"", errs.ErrParsingFailed, tail)
}
ret.Registry = matchReg[1]
@ -150,7 +150,7 @@ func NewHost(parse string) (Ref, error) {
case "ocidir", "ocifile":
matchPath := ocidirRE.FindStringSubmatch(tail)
if matchPath == nil || len(matchPath) < 2 || matchPath[1] == "" {
if len(matchPath) < 2 || matchPath[1] == "" {
return Ref{}, fmt.Errorf("%w, invalid path for scheme \"%s\": %s", errs.ErrParsingFailed, scheme, tail)
}
ret.Path = matchPath[1]