archive/ops
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Oleg Sheynin 2025-01-27 18:24:47 -05:00
parent f639bd41f5
commit d5e1f0a446
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.9.9,docker build imagages script fix 1.9.9.F2,docker build imagages script fix

28
build/docker_images_builder.sh
View File

@ -5,6 +5,11 @@ usage() {
echo echo
exit 1 exit 1
} }
error_exit() {
echo "ERROR: ${1}"
exit 1
}
# --- Settings # --- Settings
RootDir=${1} RootDir=${1}
if [ -z "${RootDir}" ] ; then if [ -z "${RootDir}" ] ; then
@ -77,22 +82,21 @@ build_docker_image() {
Cmd+=" -t ${image_name}:${image_version}" Cmd+=" -t ${image_name}:${image_version}"
Cmd+=" -f ${DockerDir}/Dockerfile ${RootDir}" Cmd+=" -f ${DockerDir}/Dockerfile ${RootDir}"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} 1>&2 || exit 1 eval ${Cmd} 1>&2 || error_exit "Docker build failed"
if [ ! -z "${test_script}" ]; then if [ ! -z "${test_script}" ] && [ "${test_script}" != "null" ]; then
if [ ! -f ${DockerDir}/${test_script} ]; then if [ ! -f ${DockerDir}/${test_script} ]; then
echo "Test script ${test_script} is missing" error_exit "Test script ${test_script} is missing"
exit 1
fi fi
echo "Running test script ${test_script} for ${image_name}" echo "Running test script ${test_script} for ${image_name}"
Cmd="docker cp ${DockerDir}/${test_script} ${image_name}:/" Cmd="docker cp ${DockerDir}/${test_script} ${image_name}:/"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} 1>&2 || exit 1 eval ${Cmd} 1>&2 || error_exit "Test script copy failed"
Cmd="docker exec ${image_name} chmod +x /${test_script}" Cmd="docker exec ${image_name} chmod +x /${test_script}"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} 1>&2 || exit 1 eval ${Cmd} 1>&2 || error_exit "Test script chmod failed"
Cmd="docker run" Cmd="docker run"
Cmd+=" --rm" Cmd+=" --rm"
@ -102,12 +106,12 @@ build_docker_image() {
Cmd+=" /bin/bash -c /${TestScript}" Cmd+=" /bin/bash -c /${TestScript}"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} 1>&2 || exit 1 eval ${Cmd} 1>&2 || error_exit "Test script run failed"
echo "Removing test script ${test_script} from ${image_name}" echo "Removing test script ${test_script} from ${image_name}"
Cmd="docker exec ${image_name} rm /${test_script}" Cmd="docker exec ${image_name} rm /${test_script}"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} 1>&2 || exit 1 eval ${Cmd} 1>&2 || error_exit "Test script remove failed"
fi fi
@ -148,23 +152,23 @@ COMMENT
Cmd+=" ${image_name}:latest" Cmd+=" ${image_name}:latest"
Cmd+=" ${RegistryService}/${image_name}:latest" Cmd+=" ${RegistryService}/${image_name}:latest"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} || exit eval ${Cmd} || error_exit "Docker tag failed"
Cmd="docker tag" Cmd="docker tag"
Cmd+=" ${image_name}:${image_version}" Cmd+=" ${image_name}:${image_version}"
Cmd+=" ${RegistryService}/${image_name}:${image_version}" Cmd+=" ${RegistryService}/${image_name}:${image_version}"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} || exit eval ${Cmd} || error_exit "Docker tag 2failed"
Cmd="docker push" Cmd="docker push"
Cmd+=" ${RegistryService}/${image_name}:latest" Cmd+=" ${RegistryService}/${image_name}:latest"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} || exit eval ${Cmd} || error_exit "Docker push failed"
Cmd="docker push" Cmd="docker push"
Cmd+=" ${RegistryService}/${image_name}:${image_version}" Cmd+=" ${RegistryService}/${image_name}:${image_version}"
echo ${Cmd} echo ${Cmd}
eval ${Cmd} || exit eval ${Cmd} || error_exit "Docker push 2 failed"
echo "Removing the copy of ${project} from ${RootDir}" echo "Removing the copy of ${project} from ${RootDir}"
Cmd="rm -rf ${RootDir}/${project}" Cmd="rm -rf ${RootDir}/${project}"