summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbuild.sh2
-rw-r--r--build/build.yaml5
-rwxr-xr-xdeploy.sh2
-rwxr-xr-xdeploy/compass_vm.sh5
4 files changed, 9 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index 462f76a6..a6276621 100755
--- a/build.sh
+++ b/build.sh
@@ -101,7 +101,7 @@ function build_tar()
cd $CACHE_DIR
sudo rm -rf compass_dists
mkdir -p compass_dists
- sudo cp -f *.tar *.iso compass_dists
+ sudo cp -f *.tar *.iso *.tgz compass_dists
sudo cp $COMPASS_PATH/build/build*.yaml compass_dists
sudo cp -rf $COMPASS_PATH/util/docker-compose ./
sudo tar -zcf compass.tar.gz docker-compose compass_dists
diff --git a/build/build.yaml b/build/build.yaml
index 5f3eff90..88eec9e2 100644
--- a/build/build.yaml
+++ b/build/build.yaml
@@ -10,6 +10,11 @@ packages:
get_method: cached
url: http://artifacts.opnfv.org/compass4nfv/package/master/ubuntu-16.04.3-server-amd64.iso
+ - name: harbor-offline-installer-v1.5.0.tgz
+ description: "The package of harbor v1.5.5"
+ get_method: cached
+ url: http://artifacts.opnfv.org/compass4nfv/package/master/harbor-offline-installer-v1.5.0.tgz
+
- name: compass-deck
description: "RESTful API and DB Handlers for Compass"
get_method: docker
diff --git a/deploy.sh b/deploy.sh
index 92454e91..acfc75c5 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -19,8 +19,6 @@
#export DEPLOY_HARBOR="true"
#export HABOR_VERSION="1.5.0"
-# Set url for download the tar file of harbor
-#export HABOR_DOWNLOAD_URL=https://storage.googleapis.com/harbor-releases/release-$HABOR_VERSION/harbor-offline-installer-v$HABOR_VERSION.tgz
# Set hardware deploy jumpserver PXE NIC
# You need to comment out it when virtual deploy.
#export INSTALL_NIC=eth1
diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 2f909b60..f7bc378e 100755
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -190,11 +190,12 @@ function launch_harbor() {
local harbor_cfg=$harbor_install_dir/harbor/harbor.cfg
local harbor_docker_compose=$harbor_install_dir/harbor/docker-compose.yml
+ local harbor_tar=$harbor_install_dir/compass_dists/harbor-offline-installer-v$HABOR_VERSION.tgz
rm -f $WORK_DIR/cache/harbor-offline-installer-v$HABOR_VERSION.tgz
- curl --connect-timeout 10 -o $WORK_DIR/cache/harbor-offline-installer-v$HABOR_VERSION.tgz $HABOR_DOWNLOAD_URL
+ curl --connect-timeout 10 -o $WORK_DIR/cache/harbor-offline-installer-v$HABOR_VERSION.tgz file://$harbor_tar
tar -zxf $WORK_DIR/cache/harbor-offline-installer-v$HABOR_VERSION.tgz -C $harbor_install_dir
- sed "s/^hostname = .*/hostname = $INSTALL_IP/g" -i $harbor_cfg
+ sed "s/^hostname = .*/hostname = $INSTALL_IP:8080/g" -i $harbor_cfg
sed "s/80:80/8080:80/g" -i $harbor_docker_compose
sed "s/443:443/8443:443/g" -i $harbor_docker_compose
cd $harbor_install_dir/harbor/