fix: 更新Docker构建脚本和Dockerfile
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -xe
|
||||
# Check if Docker is installed
|
||||
if command -v docker &> /dev/null; then
|
||||
echo $(docker --version)
|
||||
@@ -117,22 +117,22 @@ docker_build() {
|
||||
cd ${BuildDir}
|
||||
|
||||
# check docker image
|
||||
if ! docker images | grep -q "mariadb:10.6.21"; then
|
||||
if ! docker images | grep -q "mariadb\s*10.6.21"; then
|
||||
docker pull mariadb:10.6.21
|
||||
fi
|
||||
if [ ! -f ./$ReleaseFileName/tar/mariadb_10.6.21.tar ]; then
|
||||
docker save mariadb:10.6.21 -o ./${ReleaseFileName}/tar/mariadb_10.6.21.tar
|
||||
if [ ! -f ${BuildDir}/$ReleaseFileName/tar/mariadb_10.6.21.tar ]; then
|
||||
docker save mariadb:10.6.21 -o ${BuildDir}/${ReleaseFileName}/tar/mariadb_10.6.21.tar
|
||||
fi
|
||||
if ! docker images | grep -q "bitnami/keydb:6.3.4"; then
|
||||
if ! docker images | grep -q "bitnami/keydb\s*6.3.4"; then
|
||||
docker pull bitnami/keydb:6.3.4
|
||||
fi
|
||||
if [ ! -f ./$ReleaseFileName/tar/keydb_6.3.4.tar ]; then
|
||||
docker save bitnami/keydb:6.3.4 -o ./${ReleaseFileName}/tar/keydb_6.3.4.tar
|
||||
if [ ! -f ${BuildDir}/$ReleaseFileName/tar/keydb_6.3.4.tar ]; then
|
||||
docker save bitnami/keydb:6.3.4 -o ${BuildDir}/${ReleaseFileName}/tar/keydb_6.3.4.tar
|
||||
fi
|
||||
|
||||
# build omc
|
||||
docker build --platform ${PLATFORM} --build-arg VERSION=${VERSION} -t omc:${VERSION} .
|
||||
docker save omc:${VERSION} -o ./${ReleaseFileName}/tar/omc_${VERSION}.tar
|
||||
docker save omc:${VERSION} -o ${BuildDir}/${ReleaseFileName}/tar/omc_${VERSION}.tar
|
||||
|
||||
# tar package
|
||||
tar -czvf ${ReleaseDir}/${ReleaseFileName}.tar ./${ReleaseFileName}
|
||||
@@ -147,7 +147,7 @@ docker_build() {
|
||||
# =================== building
|
||||
echo
|
||||
echo "building omc..."
|
||||
mkdir -p ${BuildDir}/${ReleaseFileName}
|
||||
mkdir -p ${BuildDir}/${ReleaseFileName}/tar
|
||||
cp -rf ${BuildPackagelDir}/docker/Dockerfile.${SYSTEM}.${PLATFORM_ARCH} ${BuildDir}/Dockerfile
|
||||
cp -rf ${BuildPackagelDir}/docker/release/* ${BuildDir}/${ReleaseFileName}
|
||||
cp -rf ${BuildLinuxDir} ${BuildDir}
|
||||
|
||||
Reference in New Issue
Block a user