From 477fc6a73fddd27f468a884c139b82f0a0a5ce7e Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Mon, 3 Dec 2018 13:22:35 +0100 Subject: Docker Provisioning: Remove the obsolete tag of test servers from Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The SHA-1 tag of a server image is generated by the shared function (sha1tree) in testserver_util.sh. The sha1tree function sorts the files by the their SHA-1 and use the accumulated results as the TAG. So that, we can assign the same SHA-1 value to a server on all the platforms. Change-Id: If87ac72f7a9c5cdebef04977480d27b26a701b73 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/linux/docker_testserver.sh | 5 ----- 1 file changed, 5 deletions(-) (limited to 'coin/provisioning/common/linux') diff --git a/coin/provisioning/common/linux/docker_testserver.sh b/coin/provisioning/common/linux/docker_testserver.sh index a272d706..2d5d9611 100755 --- a/coin/provisioning/common/linux/docker_testserver.sh +++ b/coin/provisioning/common/linux/docker_testserver.sh @@ -55,11 +55,6 @@ source "$SERVER_PATH/settings.sh" for server in $testserver do context="$SERVER_PATH/$server" - # obsolete - This one is still needed for CI. It will be removed later. - sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \ - sha1sum | awk '{ print $1 }') - sudo docker build -t qt-test-server-$server:$sha1 $context - # Sort files by their SHA-1 and use the accumulated result as the TAG sudo docker build -t qt-test-server-$server:$(sha1tree $context) $context done -- cgit v1.2.3