Skip to content

Commit

Permalink
change nfs-common package
Browse files Browse the repository at this point in the history
  • Loading branch information
stonezdj committed Sep 11, 2018
1 parent 89c46dc commit 5967fd2
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
8 changes: 8 additions & 0 deletions jobs/harbor/templates/bin/ctl.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ JOB_NAME=harbor
HARBOR_RUN_DIR=$RUN_DIR/$JOB_NAME
HARBOR_LOG_DIR=$LOG_DIR/$JOB_NAME
HARBOR_JOB_DIR=$JOB_DIR/$JOB_NAME
NFS_PKG_DIR=/var/vcap/packages/nfs-common
PIDFILE=${HARBOR_RUN_DIR}/harbor.pid
TEMP_PIDFILE=${HARBOR_RUN_DIR}/harbor.tmp.pid
HARBOR_PACKAGE_DIR=${PACKAGE_DIR}/harbor-app
Expand Down Expand Up @@ -48,6 +49,8 @@ exec 2>> $HARBOR_LOG_DIR/ctl.stderr.log
source $PACKAGE_DIR/harbor-common/common.sh
source $HARBOR_JOB_DIR/bin/properties.sh



<%- if_p("registry_storage_provider.nfs.server_uri") do |uri| -%>
mount_point='<%= p("registry_storage_provider.nfs.mount_point") %>'
# Change default storage for registry container to the mount_point.
Expand All @@ -63,6 +66,11 @@ fi
nfs_uri='<%= uri %>'
mkdir -p $mount_point
if ! mount | grep -q $nfs_uri ; then
dpkg -i ${NFS_PKG_DIR}/nfs-common/keyutils_1.5.9-8ubuntu1_amd64.deb
dpkg -i ${NFS_PKG_DIR}/nfs-common/libnfsidmap2_0.25-5_amd64.deb
dpkg -i ${NFS_PKG_DIR}/nfs-common/rpcbind_0.2.3-0.2_amd64.deb
dpkg -i ${NFS_PKG_DIR}/nfs-common/libevent-2.0-5_2.0.21-stable-2ubuntu0.16.04.1_amd64.deb
dpkg -i ${NFS_PKG_DIR}/nfs-common/nfs-common_1.2.8-9ubuntu12_amd64.deb
mount $nfs_uri $mount_point
fi
<%- end -%>
Expand Down
20 changes: 12 additions & 8 deletions packages/nfs-common/packaging
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# wget http://mirrors.kernel.org/ubuntu/pool/main/n/nfs-utils/nfs-common_1.2.8-9ubuntu12_amd64.deb

dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/keyutils_1.5.9-8ubuntu1_amd64.deb
dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/libnfsidmap2_0.25-5_amd64.deb
dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/rpcbind_0.2.3-0.2_amd64.deb
dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/libevent-2.0-5_2.0.21-stable-2ubuntu0.16.04.1_amd64.deb
dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/nfs-common_1.2.8-9ubuntu12_amd64.deb



#dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/keyutils_1.5.9-8ubuntu1_amd64.deb
#dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/libnfsidmap2_0.25-5_amd64.deb
#dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/rpcbind_0.2.3-0.2_amd64.deb
#dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/libevent-2.0-5_2.0.21-stable-2ubuntu0.16.04.1_amd64.deb
#dpkg -i ${BOSH_COMPILE_TARGET}/nfs-common/nfs-common_1.2.8-9ubuntu12_amd64.deb


cp ${BOSH_COMPILE_TARGET}/nfs-common/keyutils_1.5.9-8ubuntu1_amd64.deb ${BOSH_INSTALL_TARGET}
cp ${BOSH_COMPILE_TARGET}/nfs-common/libnfsidmap2_0.25-5_amd64.deb ${BOSH_INSTALL_TARGET}
cp ${BOSH_COMPILE_TARGET}/nfs-common/rpcbind_0.2.3-0.2_amd64.deb ${BOSH_INSTALL_TARGET}
cp ${BOSH_COMPILE_TARGET}/nfs-common/libevent-2.0-5_2.0.21-stable-2ubuntu0.16.04.1_amd64.deb ${BOSH_INSTALL_TARGET}
cp ${BOSH_COMPILE_TARGET}/nfs-common/nfs-common_1.2.8-9ubuntu12_amd64.deb ${BOSH_INSTALL_TARGET}

0 comments on commit 5967fd2

Please sign in to comment.