diff --git a/build/docker_images_builder.sh b/build/docker_images_builder.sh index 6f26ea9..1a4d24e 100755 --- a/build/docker_images_builder.sh +++ b/build/docker_images_builder.sh @@ -60,6 +60,40 @@ build_docker_image() { echo "getting lastest version of ${project} on ${ReleaseUser}@${ReleaseHost}:${ReleaseDir}" ${SetVersionScript} ${project} ${image_version} + DockerDir=./docker_dev/${docker_dev} + echo "Building ${title}... on ${DockerDev}" + + Cmd="docker build" + Cmd+=" -t ${image_name}" + Cmd+=" -t ${image_name}:latest" + Cmd+=" -t ${image_name}:${image_version}" + Cmd+=" -f ${DockerDir}/Dockerfile ${RootDir}" + echo ${Cmd} + eval ${Cmd} || exit + + Cmd="docker tag" + Cmd+=" ${image_name}:latest" + Cmd+=" ${RegistryService}/${image_name}:latest" + echo ${Cmd} + eval ${Cmd} || exit + + Cmd="docker tag" + Cmd+=" ${image_name}:${image_version}" + Cmd+=" ${RegistryService}/${image_name}:${image_version}" + echo ${Cmd} + eval ${Cmd} || exit + + Cmd="docker push" + Cmd+=" ${RegistryService}/${image_name}:latest" + echo ${Cmd} + eval ${Cmd} || exit + + Cmd="docker push" + Cmd+=" ${RegistryService}/${image_name}:${image_version}" + echo ${Cmd} + eval ${Cmd} || exit + + } image_exists() { @@ -101,36 +135,3 @@ exit #=============================================================================== #=============================================================================== -DockerDir=$(realpath $(dirname ${0})/${AppPath}) - -AppName=$(basename ${AppPath}) - -ImageName=${AppName} -ImageDir=${HOME}/docker_images -mkdir -p ${ImageDir} - -Version=$(cat ${RootDir}/cvttpy/release_version.txt | awk -F, '{print $1}') - -cd ${RootDir} - -Cmd="docker build -t ${ImageName} -t ${ImageName}:latest -t ${ImageName}:${Version} -f ${DockerDir}/Dockerfile ." -echo ${Cmd} -eval ${Cmd} || exit - -Cmd="docker tag ${ImageName}:latest ${RegistryService}/${ImageName}:latest" -echo ${Cmd} -eval ${Cmd} || exit - -Cmd="docker tag ${ImageName}:${Version} ${RegistryService}/${ImageName}:${Version}" -echo ${Cmd} -eval ${Cmd} || exit - -Cmd="docker push ${RegistryService}/${ImageName}:latest" -echo ${Cmd} -eval ${Cmd} || exit - -Cmd="docker push ${RegistryService}/${ImageName}:${Version}" -echo ${Cmd} -eval ${Cmd} || exit - - diff --git a/release_version.txt b/release_version.txt index 1802e9b..999b02f 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -1.8.3,changes to build scripts +1.8.4,initial (not working) version of docker_image_builder.sh