diff --git a/subtree/harbor/make/photon/trivy-adapter/Dockerfile.trivy.binary b/subtree/harbor/make/photon/trivy-adapter/Dockerfile.trivy.binary index 8fbed3542f..dd1995fd78 100644 --- a/subtree/harbor/make/photon/trivy-adapter/Dockerfile.trivy.binary +++ b/subtree/harbor/make/photon/trivy-adapter/Dockerfile.trivy.binary @@ -1,4 +1,4 @@ -FROM docker-mirrors.alauda.cn/library/golang:1.24.6 +FROM docker-mirrors.alauda.cn/library/golang:1.24.11 ADD . /go/src/github.com/aquasecurity/trivy/ WORKDIR /go/src/github.com/aquasecurity/trivy/ diff --git a/subtree/harbor/src/go.mod b/subtree/harbor/src/go.mod index aebaff838a..fe0e628724 100644 --- a/subtree/harbor/src/go.mod +++ b/subtree/harbor/src/go.mod @@ -1,6 +1,6 @@ module github.com/goharbor/harbor/src -go 1.25.3 +go 1.25.5 require ( filippo.io/csrf v0.2.1 diff --git a/testing/go.mod b/testing/go.mod index 27d1deb08d..c2edcb3f23 100644 --- a/testing/go.mod +++ b/testing/go.mod @@ -1,6 +1,6 @@ module harbor -go 1.25.4 +go 1.25.5 require ( github.com/AlaudaDevops/bdd v1.7.2 diff --git a/testing/testdata/harbor.yaml b/testing/testdata/harbor.yaml index 2b66ad3682..b34946fb8e 100644 --- a/testing/testdata/harbor.yaml +++ b/testing/testdata/harbor.yaml @@ -76,7 +76,7 @@ spec: image: repository: /devops/goharbor-harbor-db # The default values of image tag will be automatically updated by `update-image-tags` in the `.tekton/all-in-one.yaml` pipeline. - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 resources: requests: cpu: 100m @@ -92,7 +92,7 @@ spec: image: repository: /devops/goharbor-redis-photon # The default values of image tag will be automatically updated by `update-image-tags` in the `.tekton/all-in-one.yaml` pipeline. - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 extraEnvVars: - name: ALLOW_EMPTY_PASSWORD value: "yes" diff --git a/testing/testdata/script/run-harbor-e2e.sh b/testing/testdata/script/run-harbor-e2e.sh index a0e4586a83..37fc800f4f 100755 --- a/testing/testdata/script/run-harbor-e2e.sh +++ b/testing/testdata/script/run-harbor-e2e.sh @@ -30,7 +30,7 @@ is_ipv6() { # 该镜像的默认值会由 `.tekton/all-in-one.yaml` 流水线中的 `update-image-tags` 自动更新 # 如需修改,请同步更新 Makefile 中的 `update-e2e-image-tag` -TEST_IMAGE=${E2E_ENGINE_IMAGE:-"registry.alauda.cn:60070/devops/harbor-e2e-engine:2.14.1-g1d0e6c5"} +TEST_IMAGE=${E2E_ENGINE_IMAGE:-"registry.alauda.cn:60070/devops/harbor-e2e-engine:2.14.1-g9f6e212"} DEPENDS_IMAGE_REGISTRY=${E2E_DEPENDS_IMAGE_REGISTRY:-"ghcr.io"} HARBOR_HOST_SCHEMA=${1:-"http"} diff --git a/testing/testdata/snippets/base-values.yaml b/testing/testdata/snippets/base-values.yaml index 971a129049..6b1374f237 100644 --- a/testing/testdata/snippets/base-values.yaml +++ b/testing/testdata/snippets/base-values.yaml @@ -56,7 +56,7 @@ database: image: repository: /devops/goharbor-harbor-db # The default values of image tag will be automatically updated by `update-image-tags` in the `.tekton/all-in-one.yaml` pipeline. - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 resources: requests: cpu: 100m @@ -72,7 +72,7 @@ redis: image: repository: /devops/goharbor-redis-photon # The default values of image tag will be automatically updated by `update-image-tags` in the `.tekton/all-in-one.yaml` pipeline. - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 extraEnvVars: - name: ALLOW_EMPTY_PASSWORD value: "yes" diff --git a/values.yaml b/values.yaml index 8ab373afc1..b9b3b0709b 100644 --- a/values.yaml +++ b/values.yaml @@ -5,37 +5,37 @@ global: images: portal: repository: devops/goharbor-harbor-portal - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: "" core: repository: devops/goharbor-harbor-core - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: "" jobservice: repository: devops/goharbor-harbor-jobservice - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: "" registry: repository: devops/goharbor-registry-photon - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: "" registryController: repository: devops/goharbor-harbor-registryctl - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: "" trivy: repository: devops/goharbor-trivy-adapter-photon - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: "" @@ -46,13 +46,13 @@ global: thirdparty: true nginx: repository: devops/goharbor-nginx-photon - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: "" exporter: repository: devops/goharbor-harbor-exporter - tag: 2.14.1-g1d0e6c5 + tag: 2.14.1-g9f6e212 support_arm: true thirdparty: true digest: ""