Skip to content

Commit 2ee89ee

Browse files
committed
Update nfs-common packages for 2.8
1 parent 209f394 commit 2ee89ee

File tree

3 files changed

+13
-20
lines changed

3 files changed

+13
-20
lines changed

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

+3-8
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ loadImages() {
174174
#Load images
175175
log "Loading docker images ..."
176176
$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
177179
}
178180

179181
# Setup NFS directory and update docker-compose.yml
@@ -195,14 +197,7 @@ function setupNFS() {
195197
mkdir -p $mount_point
196198
if ! mount | grep -q $nfs_uri ; then
197199
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
206201
mount $nfs_uri $mount_point
207202

208203
set -e

packages/nfs-common/packaging

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1+
set -e # exit immediately if a simple command exits with a non-zero status
2+
set -u # report the usage of uninitialized variables
13

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

packages/nfs-common/spec

+1-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,4 @@
22
name: nfs-common
33

44
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

0 commit comments

Comments
 (0)