Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-25 11:46:43 +01:00
Code Issues Projects Releases Wiki Activity

bump up distribution version to v2.8 (#16338)

Browse Source 
Signed-off-by: Wang Yan <wangyan@vmware.com>
This commit is contained in:
Wang Yan 2022-02-10 11:46:58 +08:00 committed by GitHub
parent 1a2dd256b5
commit 6c3f9a8366
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -108,7 +108,7 @@ PKGVERSIONTAG=dev
PREPARE_VERSION_NAME=versions PREPARE_VERSION_NAME=versions
#versions #versions
REGISTRYVERSION=v2.7.1-patch-2819-2553-redis REGISTRYVERSION=v2.8.0-patch-redis
NOTARYVERSION=v0.6.1 NOTARYVERSION=v0.6.1
NOTARYMIGRATEVERSION=v4.11.0 NOTARYMIGRATEVERSION=v4.11.0
TRIVYVERSION=v0.22.0 TRIVYVERSION=v0.22.0
@ -121,7 +121,7 @@ CHARTMUSEUM_SRC_TAG=v0.14.0
CHARTMUSEUMVERSION=$(CHARTMUSEUM_SRC_TAG)-redis CHARTMUSEUMVERSION=$(CHARTMUSEUM_SRC_TAG)-redis
# version of registry for pulling the source code # version of registry for pulling the source code
REGISTRY_SRC_TAG=v2.7.1 REGISTRY_SRC_TAG=v2.8.0
# dependency binaries # dependency binaries
CHARTURL=https://storage.googleapis.com/harbor-builds/bin/chartmuseum/release-${CHARTMUSEUMVERSION}/chartm CHARTURL=https://storage.googleapis.com/harbor-builds/bin/chartmuseum/release-${CHARTMUSEUMVERSION}/chartm

12
make/photon/registry/builder
View File

@ -22,18 +22,6 @@ cur=$PWD
TEMP=`mktemp -d ${TMPDIR-/tmp}/distribution.XXXXXX` TEMP=`mktemp -d ${TMPDIR-/tmp}/distribution.XXXXXX`
git clone -b $VERSION https://github.com/distribution/distribution.git $TEMP git clone -b $VERSION https://github.com/distribution/distribution.git $TEMP
# add patch 2879
echo 'add patch https://github.com/distribution/distribution/pull/2879 ...'
cd $TEMP
wget https://github.com/distribution/distribution/pull/2879.patch
git apply 2879.patch
# add patch 3370
echo 'add patch https://github.com/distribution/distribution/pull/3370 ...'
cd $TEMP
wget https://github.com/distribution/distribution/pull/3370.patch
git apply 3370.patch
# add patch redis # add patch redis
git apply $cur/redis.patch git apply $cur/redis.patch
cd $cur cd $cur

2
tests/ci/ut_install.sh
View File

@ -20,7 +20,7 @@ sudo rm -rf /data/*
sudo -E env "PATH=$PATH" make go_check sudo -E env "PATH=$PATH" make go_check
sudo ./tests/hostcfg.sh sudo ./tests/hostcfg.sh
sudo ./tests/generateCerts.sh sudo ./tests/generateCerts.sh
sudo make build -e BUILDTARGET="_build_db _build_registry _build_prepare" -e PULL_BASE_FROM_DOCKERHUB=false sudo make build -e BUILDTARGET="_build_db _build_registry _build_prepare" -e PULL_BASE_FROM_DOCKERHUB=false -e BUILDBIN=true
docker run --rm -v /:/hostfs:z goharbor/prepare:dev gencert -p /etc/harbor/tls/internal docker run --rm -v /:/hostfs:z goharbor/prepare:dev gencert -p /etc/harbor/tls/internal
sudo MAKEPATH=$(pwd)/make ./make/prepare sudo MAKEPATH=$(pwd)/make ./make/prepare
sudo mkdir -p "/data/redis" sudo mkdir -p "/data/redis"