[ARVADOS] updated: 64736a9fa518af448b98e6277185acc269bd5ade

git at public.curoverse.com git at public.curoverse.com
Thu Jul 9 23:00:52 EDT 2015


Summary of changes:
 docker/mkimage-debootstrap.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

       via  64736a9fa518af448b98e6277185acc269bd5ade (commit)
      from  dee0d839af1a7cd1eca4b31f7f2371ff3b0803ed (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 64736a9fa518af448b98e6277185acc269bd5ade
Author: Ward Vandewege <ward at curoverse.com>
Date:   Thu Jul 9 23:00:20 2015 -0400

    Make sure that mkimage-debootstrap.sh uses -f when tagging docker
    images.
    
    refs #6528

diff --git a/docker/mkimage-debootstrap.sh b/docker/mkimage-debootstrap.sh
index 0e99ec6..2ad79ef 100755
--- a/docker/mkimage-debootstrap.sh
+++ b/docker/mkimage-debootstrap.sh
@@ -209,25 +209,25 @@ else
 			Debian)
 				if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then
 					# tag latest
-					$docker tag $repo:$suite $repo:latest
+					$docker tag -f $repo:$suite $repo:latest
 					
 					if [ -r etc/debian_version ]; then
 						# tag the specific debian release version (which is only reasonable to tag on debian stable)
 						ver=$(cat etc/debian_version)
-						$docker tag $repo:$suite $repo:$ver
+						$docker tag -f $repo:$suite $repo:$ver
 					fi
 				fi
 				;;
 			Ubuntu)
 				if [ "$suite" = "$ubuntuLatestLTS" ]; then
 					# tag latest
-					$docker tag $repo:$suite $repo:latest
+					$docker tag -f $repo:$suite $repo:latest
 				fi
 				if [ -r etc/lsb-release ]; then
 					lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
 					if [ "$lsbRelease" ]; then
 						# tag specific Ubuntu version number, if available (12.04, etc.)
-						$docker tag $repo:$suite $repo:$lsbRelease
+						$docker tag -f $repo:$suite $repo:$lsbRelease
 					fi
 				fi
 				;;

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list