fix: 更新Docker构建脚本,调整平台参数
This commit is contained in:
@@ -2,13 +2,13 @@
|
||||
|
||||
# front-end Catalog
|
||||
WebDir=/root/omc.git/fe.ems.vue3
|
||||
WebBranch=main
|
||||
WebBranch=lichang
|
||||
# back-end catalog
|
||||
ApiDir=/root/omc.git/be.ems
|
||||
ApiBranch=main
|
||||
ApiBranch=lichang
|
||||
# Package Catalog
|
||||
BuildDir=/root/omc.git/build.ems
|
||||
BuildBranch=main
|
||||
BuildBranch=lichang
|
||||
BuildTmpDir=/root/omc.git/build.ems/tmp
|
||||
# Default Version Value
|
||||
VERSION="2.2505.2"
|
||||
@@ -34,8 +34,6 @@ while [[ $# -gt 0 ]]; do
|
||||
*) usage ;;
|
||||
esac
|
||||
done
|
||||
# clear tmp dir
|
||||
rm -rf ${BuildTmpDir} && mkdir -p ${BuildTmpDir}
|
||||
|
||||
# =================== build branch
|
||||
echo
|
||||
@@ -44,6 +42,9 @@ git checkout .
|
||||
git pull
|
||||
git checkout $BuildBranch
|
||||
git pull
|
||||
# clear tmp dir
|
||||
rm -rf ${BuildTmpDir} && mkdir -p ${BuildTmpDir}
|
||||
echo "===> build checkout directory: $BuildDir"
|
||||
|
||||
# =================== Web
|
||||
echo
|
||||
@@ -99,8 +100,7 @@ echo "===> vendor data copy to $output"
|
||||
|
||||
# =================== build docker image
|
||||
echo
|
||||
bash $BuildDir/build-docker.sh --version $VERSION --platform linux/amd64 --system ubuntu22.04
|
||||
bash $BuildDir/build-docker.sh -v $VERSION -p amd64 -s ubuntu22.04
|
||||
|
||||
# Compile the front-end and back-end and then package the version
|
||||
# bash pkg-docker.sh -webBranch main -apiBranch main -v 2.2503.2
|
||||
# bash pkg-docker.sh -v 2.2503.2
|
||||
# bash pkg-docker.sh -v 2.2505.2
|
||||
|
||||
Reference in New Issue
Block a user