From ab75260d20a9b4673ff90bffc6f0f46e689d856a Mon Sep 17 00:00:00 2001 From: Shilong Liu Date: Tue, 10 Aug 2021 10:55:49 +0800 Subject: [PATCH] Reproducible build add docker image debian* to white list. (#8330) #### Why I did it 1. Add version control for debian* docker image to white list. 2. Always record docker image sha256 value, regardless of white list. --- scripts/docker_version_control.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/docker_version_control.sh b/scripts/docker_version_control.sh index 41e536f080..9dd3ad55ba 100755 --- a/scripts/docker_version_control.sh +++ b/scripts/docker_version_control.sh @@ -19,12 +19,11 @@ image_tag=`grep "^FROM " $DOCKERFILE | awk '{print$2}'` image=`echo $image_tag | cut -f1 -d:` tag=`echo $image_tag | cut -f2 -d:` -# if docker image not in white list, exit -if [[ "$IMAGENAME" != sonic-slave-* ]] && [[ "$IMAGENAME" != docker-base* ]];then - exit 0 -fi - if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,docker,* ]]; then + # if docker image not in white list, exit + if [[ "$IMAGENAME" != sonic-slave-* ]] && [[ "$IMAGENAME" != docker-base* ]] && [[ "$IMAGENAME" != debian:* ]] && [[ "$IMAGENAME" != multiarch/debian-debootstrap:* ]];then + exit 0 + fi if [ -f $version_file ];then hash_value=`grep "${ARCH}:${image_tag}" $version_file | awk -F== '{print$2}'` fi @@ -36,6 +35,9 @@ if [[ ",$SONIC_VERSION_CONTROL_COMPONENTS," == *,all,* ]] || [[ ",$SONIC_VERSION sed -i "s/$oldimage/$newimage/" $DOCKERFILE else hash_value=`docker pull $image_tag | grep Digest | awk '{print$2}'` + if [ -z hash_value ];then + hash_value=unknown + fi fi if [[ "$hash_value" != "unknown" ]];then echo -e "${ARCH}:${image_tag}==$hash_value" >> $new_version_file