fix: build enhancement
This commit is contained in:
8
.gitignore
vendored
8
.gitignore
vendored
@@ -87,9 +87,5 @@ yarn.lock
|
||||
release/debs/*.deb
|
||||
release/tars/*.tar.gz
|
||||
release/src-tars/*.tar.gz
|
||||
debbuild
|
||||
!debbuild/DEBIAN/control
|
||||
!debbuild/DEBIAN/postinst
|
||||
!debbuild/DEBIAN/preinst
|
||||
!debbuild/DEBIAN/postrm
|
||||
!debbuild/DEBIAN/prerm
|
||||
debbuild/etc
|
||||
debbuild/opt
|
||||
|
||||
@@ -45,6 +45,7 @@ pre-build-tar(){
|
||||
mkdir -p ${ReleseDir}/tars
|
||||
fi
|
||||
source ${BuildRootDir}/bin/control.sh
|
||||
cd ${BuildRootDir}
|
||||
sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release
|
||||
git update-index --assume-unchanged ${BuildDockerDir}/env/wfc-release
|
||||
}
|
||||
@@ -72,8 +73,9 @@ pre-build-deb(){
|
||||
if [ ! -d ${DebSystemdDir} ]; then
|
||||
mkdir -p ${DebSystemdDir}
|
||||
fi
|
||||
cd ${BuildRootDir}
|
||||
sed -i "s/YYYYMMDD/${RelDate}/" ${BuildDockerDir}/env/wfc-release
|
||||
--assume-unchanged ${BuildDockerDir}/env/wfc-release
|
||||
git update-index --assume-unchanged ${BuildDockerDir}/env/wfc-release
|
||||
}
|
||||
|
||||
build-extras(){
|
||||
@@ -202,6 +204,7 @@ post-build(){
|
||||
# if [ -f ${TmpEnvFile} ] && [ ! -f ${BuildDockerDir}/.env ]; then
|
||||
# mv -f ${TmpEnvFile} ${BuildDockerDir}/.env
|
||||
# fi
|
||||
cd ${BuildRootDir}
|
||||
git checkout ${BuildDockerDir}/env/wfc-release
|
||||
git update-index --no-assume-unchanged ${BuildDockerDir}/env/wfc-release
|
||||
}
|
||||
|
||||
@@ -183,8 +183,9 @@ EOF"
|
||||
while [ $elapsed -lt $timeout ]; do
|
||||
health_status=$(docker inspect --format='{{.State.Health.Status}}' $mysql_container_name)
|
||||
if [ "$health_status" == "healthy" ]; then
|
||||
echo "Upgrade database: "
|
||||
${wfc_work_dir}/bin/wfcupgdb.sh all
|
||||
echo "Container $mysql_container_name is healthy"
|
||||
echo "Executing database upgrade scripts ..."
|
||||
${wfc_work_dir}/bin/wfcupgrade.sh
|
||||
exit 0
|
||||
fi
|
||||
sleep $interval
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Package: WFC
|
||||
Version: 1.0.7
|
||||
Version: 1.0.8
|
||||
Section: WFC
|
||||
Prioritt: optional
|
||||
Architecture: amd64
|
||||
|
||||
@@ -4,4 +4,4 @@ wfc_bin_dir=/opt/wfc/bin
|
||||
|
||||
${wfc_bin_dir}/wfccontrol.sh stop
|
||||
${wfc_bin_dir}/wfcsetup.sh rm all
|
||||
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user