Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-16 20:01:35 +01:00
Code Issues Projects Releases Wiki Activity

bump distribution (#19669)

Browse Source 
Bump up the distribution to v2.8.3

Signed-off-by: wang yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2023-12-11 10:11:39 +08:00 committed by GitHub
parent 66716b7826
commit aa1f79cd0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -103,12 +103,12 @@ PKGVERSIONTAG=dev
PREPARE_VERSION_NAME=versions PREPARE_VERSION_NAME=versions
#versions #versions
REGISTRYVERSION=v2.8.2-patch-redis REGISTRYVERSION=v2.8.3-patch-redis
TRIVYVERSION=v0.47.0 TRIVYVERSION=v0.47.0
TRIVYADAPTERVERSION=v0.30.19 TRIVYADAPTERVERSION=v0.30.19
# version of registry for pulling the source code # version of registry for pulling the source code
REGISTRY_SRC_TAG=v2.8.2 REGISTRY_SRC_TAG=v2.8.3
# dependency binaries # dependency binaries
REGISTRYURL=https://storage.googleapis.com/harbor-builds/bin/registry/release-${REGISTRYVERSION}/registry REGISTRYURL=https://storage.googleapis.com/harbor-builds/bin/registry/release-${REGISTRYVERSION}/registry

29
make/photon/registry/redis.patch
View File

@ -1,5 +1,5 @@
diff --git a/configuration/configuration.go b/configuration/configuration.go diff --git a/configuration/configuration.go b/configuration/configuration.go
index dd315485..a3e0818e 100644 index 7076df85d4..3e74330321 100644
--- a/configuration/configuration.go --- a/configuration/configuration.go
+++ b/configuration/configuration.go +++ b/configuration/configuration.go
@@ -168,6 +168,9 @@ type Configuration struct { @@ -168,6 +168,9 @@ type Configuration struct {
@ -13,7 +13,7 @@ index dd315485..a3e0818e 100644
Password string `yaml:"password,omitempty"` Password string `yaml:"password,omitempty"`
diff --git a/registry/handlers/app.go b/registry/handlers/app.go diff --git a/registry/handlers/app.go b/registry/handlers/app.go
index 8a30bd4d..4e9cec34 100644 index bf56cea22a..4a7cee9a2e 100644
--- a/registry/handlers/app.go --- a/registry/handlers/app.go
+++ b/registry/handlers/app.go +++ b/registry/handlers/app.go
@@ -3,6 +3,7 @@ package handlers @@ -3,6 +3,7 @@ package handlers
@ -24,16 +24,15 @@ index 8a30bd4d..4e9cec34 100644
"expvar" "expvar"
"fmt" "fmt"
"math" "math"
@@ -16,6 +17,8 @@ import ( @@ -16,6 +17,7 @@ import (
"strings" "strings"
"time" "time"
+ "github.com/FZambia/sentinel" + "github.com/FZambia/sentinel"
+ "github.com/distribution/reference"
"github.com/docker/distribution" "github.com/docker/distribution"
"github.com/docker/distribution/configuration" "github.com/docker/distribution/configuration"
dcontext "github.com/docker/distribution/context" @@ -499,6 +501,45 @@ func (app *App) configureRedis(configuration *configuration.Configuration) {
@@ -499,6 +502,44 @@ func (app *App) configureRedis(configuration *configuration.Configuration) {
return return
} }
@ -75,6 +74,7 @@ index 8a30bd4d..4e9cec34 100644
+ return err + return err
+ } + }
+ } + }
+
pool := &redis.Pool{ pool := &redis.Pool{
Dial: func() (redis.Conn, error) { Dial: func() (redis.Conn, error) {
// TODO(stevvooe): Yet another use case for contextual timing. // TODO(stevvooe): Yet another use case for contextual timing.
@ -115,7 +115,7 @@ index 8a30bd4d..4e9cec34 100644
app.redis = pool app.redis = pool
diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go diff --git a/registry/handlers/app_test.go b/registry/handlers/app_test.go
index 60a57e6c..8a644d83 100644 index 60a57e6c15..8a644d83d8 100644
--- a/registry/handlers/app_test.go --- a/registry/handlers/app_test.go
+++ b/registry/handlers/app_test.go +++ b/registry/handlers/app_test.go
@@ -140,7 +140,29 @@ func TestAppDispatcher(t *testing.T) { @@ -140,7 +140,29 @@ func TestAppDispatcher(t *testing.T) {
@ -189,18 +189,17 @@ index 60a57e6c..8a644d83 100644
// ensuring that NewApp doesn't panic. We might want to tweak this // ensuring that NewApp doesn't panic. We might want to tweak this
// behavior. // behavior.
diff --git a/vendor.conf b/vendor.conf diff --git a/vendor.conf b/vendor.conf
index bd1b4bff..a45ac137 100644 index 33fe616b76..a8d8f58bc6 100644
--- a/vendor.conf --- a/vendor.conf
+++ b/vendor.conf +++ b/vendor.conf
@@ -49,3 +49,4 @@ gopkg.in/yaml.v2 v2.2.1 @@ -51,3 +51,4 @@ gopkg.in/yaml.v2 v2.2.1
rsc.io/letsencrypt e770c10b0f1a64775ae91d240407ce00d1a5bdeb https://github.com/dmcgowan/letsencrypt.git rsc.io/letsencrypt e770c10b0f1a64775ae91d240407ce00d1a5bdeb https://github.com/dmcgowan/letsencrypt.git
github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb github.com/opencontainers/go-digest ea51bea511f75cfa3ef6098cc253c5c3609b037a # v1.0.0
github.com/opencontainers/image-spec 67d2d5658fe0476ab9bf414cec164077ebff3920 # v1.0.2 github.com/opencontainers/image-spec 67d2d5658fe0476ab9bf414cec164077ebff3920 # v1.0.2
+github.com/FZambia/sentinel 5585739eb4b6478aa30161866ccf9ce0ef5847c7 https://github.com/jeremyxu2010/sentinel.git +github.com/FZambia/sentinel 5585739eb4b6478aa30161866ccf9ce0ef5847c7 https://github.com/jeremyxu2010/sentinel.git
\ No newline at end of file
diff --git a/vendor/github.com/FZambia/sentinel/LICENSE b/vendor/github.com/FZambia/sentinel/LICENSE diff --git a/vendor/github.com/FZambia/sentinel/LICENSE b/vendor/github.com/FZambia/sentinel/LICENSE
new file mode 100644 new file mode 100644
index 00000000..9c8f3ea0 index 0000000000..8dada3edaf
--- /dev/null --- /dev/null
+++ b/vendor/github.com/FZambia/sentinel/LICENSE +++ b/vendor/github.com/FZambia/sentinel/LICENSE
@@ -0,0 +1,201 @@ @@ -0,0 +1,201 @@
@ -405,10 +404,9 @@ index 00000000..9c8f3ea0
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and + See the License for the specific language governing permissions and
+ limitations under the License. + limitations under the License.
\ No newline at end of file
diff --git a/vendor/github.com/FZambia/sentinel/README.md b/vendor/github.com/FZambia/sentinel/README.md diff --git a/vendor/github.com/FZambia/sentinel/README.md b/vendor/github.com/FZambia/sentinel/README.md
new file mode 100644 new file mode 100644
index 00000000..fc810435 index 0000000000..f544c54ef6
--- /dev/null --- /dev/null
+++ b/vendor/github.com/FZambia/sentinel/README.md +++ b/vendor/github.com/FZambia/sentinel/README.md
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
@ -451,10 +449,9 @@ index 00000000..fc810435
+------- +-------
+ +
+Library is available under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html). +Library is available under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).
\ No newline at end of file
diff --git a/vendor/github.com/FZambia/sentinel/sentinel.go b/vendor/github.com/FZambia/sentinel/sentinel.go diff --git a/vendor/github.com/FZambia/sentinel/sentinel.go b/vendor/github.com/FZambia/sentinel/sentinel.go
new file mode 100644 new file mode 100644
index 00000000..98dea26d index 0000000000..79209e9f0d
--- /dev/null --- /dev/null
+++ b/vendor/github.com/FZambia/sentinel/sentinel.go +++ b/vendor/github.com/FZambia/sentinel/sentinel.go
@@ -0,0 +1,426 @@ @@ -0,0 +1,426 @@