diff --git a/build-docker.sh b/build-docker.sh index 14b5dea..279aa52 100644 --- a/build-docker.sh +++ b/build-docker.sh @@ -91,7 +91,7 @@ BuildDir=${RootDir}/tmp # Release Package directory ReleaseDir=${RootDir}/release/docker/${PLATFORM_ARCH} # Release Package name file -ReleaseFileName=omc-r${VERSION}-${SYSTEM}-docker +ReleaseFileName=omc-r${VERSION}-docker-${SYSTEM}-${PLATFORM_ARCH} # =================== file processing @@ -103,7 +103,7 @@ app() { modeList="std lite" for v in ${modeList}; do # . /Located in the temporary directory - path=./usr/local/etc/omc/database/${v} + path=./linux/usr/local/etc/omc/database/${v} cp -rf $path/common/* $path/install/ cp -rf $path/common/* $path/upgrade/ rm -rf $path/common @@ -120,22 +120,22 @@ docker_build() { if ! docker images | grep -q "mariadb: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 ./$ReleaseFileName/tar/mariadb_10.6.21.tar ]; then + docker save mariadb:10.6.21 -o ./${ReleaseFileName}/tar/mariadb_10.6.21.tar fi if ! docker images | grep -q "bitnami/keydb: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 ./$ReleaseFileName/tar/keydb_6.3.4.tar ]; then + docker save bitnami/keydb:6.3.4 -o ./${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 ./${ReleaseFileName}/tar/omc_${VERSION}.tar # tar package - tar -czvf ${ReleaseDir}/${ReleaseFileName}.tar ${ReleaseFileName}/ + tar -czvf ${ReleaseDir}/${ReleaseFileName}.tar ./${ReleaseFileName} # Generate MD5 file rm -f omc_md5sum.txt @@ -151,6 +151,7 @@ mkdir -p ${BuildDir}/${ReleaseFileName} cp -rf ${BuildPackagelDir}/docker/Dockerfile.${SYSTEM}.${PLATFORM_ARCH} ${BuildDir}/Dockerfile cp -rf ${BuildPackagelDir}/docker/release/* ${BuildDir}/${ReleaseFileName} cp -rf ${BuildLinuxDir} ${BuildDir} +ls -ls ${BuildDir} app docker_build