mirror of
https://github.com/regclient/regclient.git
synced 2025-04-18 22:44:00 +03:00
Merge pull request #923 from sudo-bmitch/pr-update-20250317
Version bump
This commit is contained in:
Brandon Mitchell
GitHub
commit
32e5be148f
4
.github/workflows/docker.yml
vendored
4
.github/workflows/docker.yml
vendored
@ -89,14 +89,14 @@ jobs:
|
||||
|
||||
- name: Login to DockerHub
|
||||
if: github.repository_owner == 'regclient'
|
||||
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
|
||||
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
|
||||
with:
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Login to GHCR
|
||||
if: github.repository_owner == 'regclient'
|
||||
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
|
||||
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ secrets.GHCR_USERNAME }}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{"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":"e1f260042e47458f562c930ebfd42c4c71b936eb"}
|
||||
{"name":"docker-arg-ecr","key":"https://github.com/awslabs/amazon-ecr-credential-helper.git:main","version":"abf9177720e144f3f8401f4df3dd2d2e9c2eaf5c"}
|
||||
{"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.1-alpine","version":"sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386"}
|
||||
{"name":"docker-arg-go-tag","key":"docker.io/library/golang","version":"1.24.1"}
|
||||
@ -19,7 +19,7 @@
|
||||
{"name":"gha-uses-commit","key":"https://github.com/actions/upload-artifact.git:v4.6.1","version":"4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1"}
|
||||
{"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.15.0","version":"471d1dc4e07e5cdedd4c2171150001c434f0b7a4"}
|
||||
{"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/login-action.git:v3.4.0","version":"74a5d142397b4f367a81961eba4e8cd7edddf772"}
|
||||
{"name":"gha-uses-commit","key":"https://github.com/docker/setup-buildx-action.git:v3.10.0","version":"b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"}
|
||||
{"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.1","version":"d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a"}
|
||||
@ -30,7 +30,7 @@
|
||||
{"name":"gha-uses-semver","key":"https://github.com/actions/upload-artifact.git","version":"v4.6.1"}
|
||||
{"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.15.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/login-action.git","version":"v3.4.0"}
|
||||
{"name":"gha-uses-semver","key":"https://github.com/docker/setup-buildx-action.git","version":"v3.10.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"}
|
||||
@ -41,7 +41,7 @@
|
||||
{"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.2"}
|
||||
{"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-osv-scanner","key":"https://github.com/google/osv-scanner.git","version":"v2.0.0"}
|
||||
{"name":"makefile-staticcheck","key":"https://github.com/dominikh/go-tools.git","version":"v0.6.1"}
|
||||
{"name":"makefile-syft-container-digest","key":"anchore/syft:v1.20.0","version":"sha256:b46e597614ddc78621e560af3fabf9346e35462ea1c886a38b30bcc7ca601a73"}
|
||||
{"name":"makefile-syft-container-tag","key":"anchore/syft","version":"v1.20.0"}
|
||||
|
||||
6
Makefile
6
Makefile
@ -37,7 +37,7 @@ MARKDOWN_LINT_VER?=v0.17.2
|
||||
GOMAJOR_VER?=v0.14.0
|
||||
GOSEC_VER?=v2.22.2
|
||||
GO_VULNCHECK_VER?=v1.1.4
|
||||
OSV_SCANNER_VER?=v1.9.2
|
||||
OSV_SCANNER_VER?=v2.0.0
|
||||
SYFT?=$(shell command -v syft 2>/dev/null)
|
||||
SYFT_CMD_VER:=$(shell [ -x "$(SYFT)" ] && echo "v$$($(SYFT) version | awk '/^Version: / {print $$2}')" || echo "0")
|
||||
SYFT_VERSION?=v1.20.0
|
||||
@ -102,7 +102,7 @@ vulnerability-scan: osv-scanner vulncheck-go ## Run all vulnerability scanners
|
||||
|
||||
.PHONY: osv-scanner
|
||||
osv-scanner: $(GOPATH)/bin/osv-scanner .FORCE ## Run OSV Scanner
|
||||
$(GOPATH)/bin/osv-scanner scan --config .osv-scanner.toml -r --experimental-licenses="Apache-2.0,BSD-3-Clause,MIT,CC-BY-SA-4.0,UNKNOWN" .
|
||||
$(GOPATH)/bin/osv-scanner scan --config .osv-scanner.toml -r --licenses="Apache-2.0,BSD-3-Clause,MIT,CC-BY-SA-4.0,UNKNOWN" .
|
||||
|
||||
.PHONY: vulncheck-go
|
||||
vulncheck-go: $(GOPATH)/bin/govulncheck .FORCE ## Run govulncheck
|
||||
@ -253,7 +253,7 @@ $(GOPATH)/bin/govulncheck: .FORCE
|
||||
$(GOPATH)/bin/osv-scanner: .FORCE
|
||||
@[ -f $(GOPATH)/bin/osv-scanner ] \
|
||||
&& [ "$$(osv-scanner --version | awk -F ': ' '{ if ($$1 == "osv-scanner version") { printf "%s\n", $$2 } }')" = "$(OSV_SCANNER_VER)" ] \
|
||||
|| CGO_ENABLED=0 go install "github.com/google/osv-scanner/cmd/osv-scanner@$(OSV_SCANNER_VER)"
|
||||
|| CGO_ENABLED=0 go install "github.com/google/osv-scanner/v2/cmd/osv-scanner@$(OSV_SCANNER_VER)"
|
||||
|
||||
.PHONY: help
|
||||
help: # Display help
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
ARG REGISTRY=docker.io
|
||||
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
|
||||
ARG GO_VER=1.24.1-alpine@sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386
|
||||
ARG ECR_HELPER_VER=e1f260042e47458f562c930ebfd42c4c71b936eb
|
||||
ARG ECR_HELPER_VER=abf9177720e144f3f8401f4df3dd2d2e9c2eaf5c
|
||||
ARG GCR_HELPER_VER=v2.1.26
|
||||
ARG LUNAJSON_COMMIT=3d10600874527d71519b33ecbb314eb93ccd1df6
|
||||
ARG SEMVER_COMMIT=a4b708ba243208d46e575da870af969dca46a94d
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
ARG REGISTRY=docker.io
|
||||
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
|
||||
ARG GO_VER=1.24.1-alpine@sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386
|
||||
ARG ECR_HELPER_VER=e1f260042e47458f562c930ebfd42c4c71b936eb
|
||||
ARG ECR_HELPER_VER=abf9177720e144f3f8401f4df3dd2d2e9c2eaf5c
|
||||
ARG GCR_HELPER_VER=v2.1.26
|
||||
ARG LUNAJSON_COMMIT=3d10600874527d71519b33ecbb314eb93ccd1df6
|
||||
ARG SEMVER_COMMIT=a4b708ba243208d46e575da870af969dca46a94d
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
ARG REGISTRY=docker.io
|
||||
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
|
||||
ARG GO_VER=1.24.1-alpine@sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386
|
||||
ARG ECR_HELPER_VER=e1f260042e47458f562c930ebfd42c4c71b936eb
|
||||
ARG ECR_HELPER_VER=abf9177720e144f3f8401f4df3dd2d2e9c2eaf5c
|
||||
ARG GCR_HELPER_VER=v2.1.26
|
||||
|
||||
FROM ${REGISTRY}/library/golang:${GO_VER} AS golang
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
ARG REGISTRY=docker.io
|
||||
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
|
||||
ARG GO_VER=1.24.1-alpine@sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386
|
||||
ARG ECR_HELPER_VER=e1f260042e47458f562c930ebfd42c4c71b936eb
|
||||
ARG ECR_HELPER_VER=abf9177720e144f3f8401f4df3dd2d2e9c2eaf5c
|
||||
ARG GCR_HELPER_VER=v2.1.26
|
||||
|
||||
FROM --platform=$BUILDPLATFORM ${REGISTRY}/library/golang:${GO_VER} AS golang
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
ARG REGISTRY=docker.io
|
||||
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
|
||||
ARG GO_VER=1.24.1-alpine@sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386
|
||||
ARG ECR_HELPER_VER=e1f260042e47458f562c930ebfd42c4c71b936eb
|
||||
ARG ECR_HELPER_VER=abf9177720e144f3f8401f4df3dd2d2e9c2eaf5c
|
||||
ARG GCR_HELPER_VER=v2.1.26
|
||||
|
||||
FROM ${REGISTRY}/library/golang:${GO_VER} AS golang
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
ARG REGISTRY=docker.io
|
||||
ARG ALPINE_VER=3.21.3@sha256:a8560b36e8b8210634f77d9f7f9efd7ffa463e380b75e2e74aff4511df3ef88c
|
||||
ARG GO_VER=1.24.1-alpine@sha256:43c094ad24b6ac0546c62193baeb3e6e49ce14d3250845d166c77c25f64b0386
|
||||
ARG ECR_HELPER_VER=e1f260042e47458f562c930ebfd42c4c71b936eb
|
||||
ARG ECR_HELPER_VER=abf9177720e144f3f8401f4df3dd2d2e9c2eaf5c
|
||||
ARG GCR_HELPER_VER=v2.1.26
|
||||
|
||||
FROM --platform=$BUILDPLATFORM ${REGISTRY}/library/golang:${GO_VER} AS golang
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user