File tree 3 files changed +13
-20
lines changed
jobs/harbor/templates/bin
3 files changed +13
-20
lines changed Original file line number Diff line number Diff line change @@ -174,6 +174,8 @@ loadImages() {
174
174
# Load images
175
175
log " Loading docker images ..."
176
176
$DOCKER_CMD load -i $HARBOR_IMAGES_TAR_PATH 2>&1
177
+ # Should load wavefront image because previous image prune will remove it
178
+ $DOCKER_CMD load -i ${PACKAGE_DIR} /wavefront/harbor-wavefront-bundle.tar 2>&1
177
179
}
178
180
179
181
# Setup NFS directory and update docker-compose.yml
@@ -195,14 +197,7 @@ function setupNFS() {
195
197
mkdir -p $mount_point
196
198
if ! mount | grep -q $nfs_uri ; then
197
199
set +e
198
-
199
- dpkg -i --auto-deconfigure ${NFS_PKG_DIR} /libc6_2.36-0ubuntu4_amd64.deb
200
- dpkg -i ${NFS_PKG_DIR} /libevent-core-2.1-7a_2.1.12-stable-5ubuntu1_amd64.deb
201
- dpkg -i ${NFS_PKG_DIR} /rpcbind_1.2.6-2build1_amd64.deb
202
- dpkg -i ${NFS_PKG_DIR} /libnfsidmap1_2.6.1-2ubuntu4.1_amd64.deb
203
- dpkg -i ${NFS_PKG_DIR} /keyutils_1.6.1-2ubuntu3_amd64.deb
204
- dpkg -i ${NFS_PKG_DIR} /nfs-common_2.6.1-2ubuntu4.1_amd64.deb
205
-
200
+ source ${NFS_PKG_DIR} /install_nfs_common.sh
206
201
mount $nfs_uri $mount_point
207
202
208
203
set -e
Original file line number Diff line number Diff line change
1
+ set -e # exit immediately if a simple command exits with a non-zero status
2
+ set -u # report the usage of uninitialized variables
1
3
2
- cp ${BOSH_COMPILE_TARGET}/nfs-common/libc6_2.36-0ubuntu4_amd64.deb ${BOSH_INSTALL_TARGET}
3
- cp ${BOSH_COMPILE_TARGET}/nfs-common/keyutils_1.6.1-2ubuntu3_amd64.deb ${BOSH_INSTALL_TARGET}
4
- cp ${BOSH_COMPILE_TARGET}/nfs-common/libnfsidmap1_2.6.1-2ubuntu4.1_amd64.deb ${BOSH_INSTALL_TARGET}
5
- cp ${BOSH_COMPILE_TARGET}/nfs-common/rpcbind_1.2.6-2build1_amd64.deb ${BOSH_INSTALL_TARGET}
6
- cp ${BOSH_COMPILE_TARGET}/nfs-common/libevent-core-2.1-7a_2.1.12-stable-5ubuntu1_amd64.deb ${BOSH_INSTALL_TARGET}
7
- cp ${BOSH_COMPILE_TARGET}/nfs-common/nfs-common_2.6.1-2ubuntu4.1_amd64.deb ${BOSH_INSTALL_TARGET}
4
+ echo "Extracting nfs-common ..."
5
+ if ! tar -xzvf ${BOSH_COMPILE_TARGET}/nfs-common/nfs-common.tgz -C ${BOSH_INSTALL_TARGET} ; then
6
+ echo "Failed to extract nfs-common tarball"
7
+ exit 1
8
+ fi
9
+
10
+ chmod +x ${BOSH_INSTALL_TARGET}/*.sh
Original file line number Diff line number Diff line change 2
2
name: nfs-common
3
3
4
4
files:
5
- - nfs-common/nfs-common_2.6.1-2ubuntu4.1_amd64.deb
6
- - nfs-common/libevent-core-2.1-7a_2.1.12-stable-5ubuntu1_amd64.deb
7
- - nfs-common/rpcbind_1.2.6-2build1_amd64.deb
8
- - nfs-common/keyutils_1.6.1-2ubuntu3_amd64.deb
9
- - nfs-common/libnfsidmap1_2.6.1-2ubuntu4.1_amd64.deb
10
- - nfs-common/libc6_2.36-0ubuntu4_amd64.deb
5
+ - nfs-common/nfs-common.tgz
You can’t perform that action at this time.
0 commit comments