Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-09-28 21:37:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1184 from ywk253100/161129_push_photon

Browse Source 
Push photon to project library
This commit is contained in:
Daniel Jiang 2016-11-29 17:34:29 +08:00 committed by GitHub
commit c214d37250
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/ova/script/common.sh
View File

@ -104,7 +104,7 @@ function configureDockerDNS {
do
if [ -n "$d" ]
then
opts="--dns=$d $opts"
opts="$opts --dns=$d"
fi
done
rm /tmp/dns
@ -112,7 +112,7 @@ function configureDockerDNS {
domain=$(sed -n -e 's/^domain //p' /etc/resolv.conf)
if [ -n "$domain" ]
then
opts="--dns-search=$domain $opts"
opts="$opts --dns-search=$domain"
fi
search=$(sed -n -e 's/^search //p' /etc/resolv.conf)
@ -123,7 +123,7 @@ function configureDockerDNS {
do
if [ -n "$s" ]
then
opts="--dns-search=$s $opts"
opts="$opts --dns-search=$s"
fi
done
fi
@ -131,4 +131,16 @@ function configureDockerDNS {
echo Setting docker: $opts
echo DOCKER_OPTS=$opts > /etc/default/docker
systemctl restart docker
}
function pushPhoton {
set +e
basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
registry_version=$(sed -n -e 's|.*library/registry:||p' $basedir/../harbor/docker-compose.yml)
docker run -d --name photon_pusher -v /data/registry:/var/lib/registry -p 5000:5000 registry:$registry_version
docker tag photon:1.0 127.0.0.1:5000/library/photon:1.0
sleep 5
docker push 127.0.0.1:5000/library/photon:1.0
docker rm -f photon_pusher
set -e
}

3
tools/ova/script/firstboot.sh
View File

@ -36,6 +36,9 @@ tar -zxvf $base_dir/../harbor-offline-installer*.tgz -C $base_dir/../
echo "Loading images..."
load
echo "Pushing photon to project library..."
pushPhoton
echo "Configuring Harbor..."
chmod 600 $base_dir/../harbor/harbor.cfg