Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion subtree/harbor/src/go.mod
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion testing/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module harbor

go 1.25.4
go 1.25.5

require (
github.com/AlaudaDevops/bdd v1.7.2
Expand Down
4 changes: 2 additions & 2 deletions testing/testdata/harbor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ spec:
image:
repository: <config.{{.registry.test | default "152-231-registry.alauda.cn:60070"}}>/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
Expand All @@ -92,7 +92,7 @@ spec:
image:
repository: <config.{{.registry.test | default "152-231-registry.alauda.cn:60070"}}>/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"
Expand Down
2 changes: 1 addition & 1 deletion testing/testdata/script/run-harbor-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"}
Expand Down
4 changes: 2 additions & 2 deletions testing/testdata/snippets/base-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ database:
image:
repository: <config.{{.registry.test | default "152-231-registry.alauda.cn:60070"}}>/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
Expand All @@ -72,7 +72,7 @@ redis:
image:
repository: <config.{{.registry.test | default "152-231-registry.alauda.cn:60070"}}>/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"
Expand Down
16 changes: 8 additions & 8 deletions values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand All @@ -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: ""
Expand Down