Update nfs-common packages for 2.9

Author: stonezdj

jobs/harbor/templates/bin/pre-start.erb.sh

@@ -171,6 +171,8 @@ loadImages() {
   #Load images
   log "Loading docker images ..."
   $DOCKER_CMD load -i $HARBOR_IMAGES_TAR_PATH 2>&1
+  #Should load wavefront image because previous image prune will remove it
+  $DOCKER_CMD load -i ${PACKAGE_DIR}/wavefront/harbor-wavefront-bundle.tar 2>&1
 }
 
 # Setup NFS directory and update docker-compose.yml
@@ -192,14 +194,7 @@ function setupNFS() {
   mkdir -p $mount_point
   if ! mount | grep -q $nfs_uri ; then
     set +e
-
-    dpkg -i --auto-deconfigure ${NFS_PKG_DIR}/libc6_2.36-0ubuntu4_amd64.deb
-    dpkg -i ${NFS_PKG_DIR}/libevent-core-2.1-7a_2.1.12-stable-5ubuntu1_amd64.deb
-    dpkg -i ${NFS_PKG_DIR}/rpcbind_1.2.6-2build1_amd64.deb
-    dpkg -i ${NFS_PKG_DIR}/libnfsidmap1_2.6.1-2ubuntu4.1_amd64.deb
-    dpkg -i ${NFS_PKG_DIR}/keyutils_1.6.1-2ubuntu3_amd64.deb
-    dpkg -i ${NFS_PKG_DIR}/nfs-common_2.6.1-2ubuntu4.1_amd64.deb
-    
+    source ${NFS_PKG_DIR}/install_nfs_common.sh
     mount $nfs_uri $mount_point
 
     set -e

packages/nfs-common/packaging

@@ -1,7 +1,10 @@
+set -e # exit immediately if a simple command exits with a non-zero status
+set -u # report the usage of uninitialized variables
 
-cp ${BOSH_COMPILE_TARGET}/nfs-common/libc6_2.36-0ubuntu4_amd64.deb ${BOSH_INSTALL_TARGET}
-cp ${BOSH_COMPILE_TARGET}/nfs-common/keyutils_1.6.1-2ubuntu3_amd64.deb ${BOSH_INSTALL_TARGET}
-cp ${BOSH_COMPILE_TARGET}/nfs-common/libnfsidmap1_2.6.1-2ubuntu4.1_amd64.deb  ${BOSH_INSTALL_TARGET}
-cp ${BOSH_COMPILE_TARGET}/nfs-common/rpcbind_1.2.6-2build1_amd64.deb  ${BOSH_INSTALL_TARGET}
-cp ${BOSH_COMPILE_TARGET}/nfs-common/libevent-core-2.1-7a_2.1.12-stable-5ubuntu1_amd64.deb  ${BOSH_INSTALL_TARGET}
-cp ${BOSH_COMPILE_TARGET}/nfs-common/nfs-common_2.6.1-2ubuntu4.1_amd64.deb  ${BOSH_INSTALL_TARGET}
+echo "Extracting nfs-common ..."
+if ! tar -xzvf ${BOSH_COMPILE_TARGET}/nfs-common/nfs-common.tgz -C ${BOSH_INSTALL_TARGET} ; then
+  echo "Failed to extract nfs-common tarball"
+  exit 1
+fi
+
+chmod +x ${BOSH_INSTALL_TARGET}/*.sh

packages/nfs-common/spec

@@ -2,9 +2,4 @@
 name: nfs-common
 
 files:
-  - nfs-common/nfs-common_2.6.1-2ubuntu4.1_amd64.deb
-  - nfs-common/libevent-core-2.1-7a_2.1.12-stable-5ubuntu1_amd64.deb
-  - nfs-common/rpcbind_1.2.6-2build1_amd64.deb
-  - nfs-common/keyutils_1.6.1-2ubuntu3_amd64.deb
-  - nfs-common/libnfsidmap1_2.6.1-2ubuntu4.1_amd64.deb
-  - nfs-common/libc6_2.36-0ubuntu4_amd64.deb
+  - nfs-common/nfs-common.tgz