diff --git a/script/tools/docker_image_update.sh b/script/tools/docker_image_update.sh index 8551b358ecab76549eb25965c985cb9f6fc3cbb5..89b572abfca534e7733df88bed46d0b466078939 100644 --- a/script/tools/docker_image_update.sh +++ b/script/tools/docker_image_update.sh @@ -104,6 +104,7 @@ function create() { ssh_cmd ${source_ip} "${cmd}" config_repo chroot_init + export branch=$(echo ${branch_name} | tr A-Z a-z) chroot "${root_path}" /bin/bash --login -c "cd /home/; bash make_docker.sh" if [ -f "${root_path}/result/docker_image/image/openEuler-docker.${ARCH}.tar.xz" ];then scp -i ${publish_key} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -r ${root_path}/result/docker_image/image/openEuler-docker.${ARCH}.tar.xz root@${source_ip}:${update_path}/${ARCH}/ diff --git a/script/tools/make_docker.sh b/script/tools/make_docker.sh index aa79fa33d192261241e5f1edad61c05064ea4121..fd13801bb9202f2823968e06deeb8964ce1f5c18 100644 --- a/script/tools/make_docker.sh +++ b/script/tools/make_docker.sh @@ -51,6 +51,7 @@ function make_image() version_time="openeuler-$(date +%Y-%m-%d-%H-%M-%S)" sed -i "s#IMAGE_NAME#${version_time}#" "${docker_config}/config.xml" + sed -i 's/container=.*>/container=\"'${branch}'\">/g' "${docker_config}/config.xml" sed -i "/obs_repo_here/a " "${docker_config}/config.xml" cp "${docker_config}/config.xml" "${cfg_dir}" cp "${docker_config}/images.sh" "${cfg_dir}"