diff options
| author |   HU Xinhui <xinhui_hu@foxmail.com> | 2018-07-30 05:37:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-07-30 05:37:40 +0000 |
| commit | a3bab642b1b3227a307325e116eaa38a569432aa (patch) | |
| tree | b64b006096fe8f03012799816243741ba4d57375 | |
| parent | 2d3669c5f9f0c2149f783ae60cda74b65b0eb1be (diff) | |
| parent | f4ce5961fa7902031f50b717c1cda8784a1f0e5d (diff) | |
Merge "change harbor offline tar to artifacts.opnfv.org"
| -rwxr-xr-x | build.sh | 2 | ||||
| -rw-r--r-- | build/build.yaml | 5 | ||||
| -rwxr-xr-x | deploy.sh | 2 | ||||
| -rwxr-xr-x | deploy/compass_vm.sh | 5 |
4 files changed, 9 insertions, 5 deletions
@@ -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 @@ -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/ |