2955: Sets jobrecord.canceled_at when canceling/failing an orphan job.

[arvados.git] / docker / mkimage-debootstrap.sh

diff --git a/docker/mkimage-debootstrap.sh b/docker/mkimage-debootstrap.sh
index b0a370da7d52496567f3df7565904d4e001bd47f..a078801b902811b232f0cc4107864231e66d0b7f 100755 (executable)
--- a/docker/mkimage-debootstrap.sh
+++ b/docker/mkimage-debootstrap.sh
@@ -192,7 +192,7 @@ if [ "$justTar" ]; then
        sudo tar --numeric-owner -caf "$repo" .
 else
        # create the image (and tag $repo:$suite)
-       sudo tar --numeric-owner -c . | $docker import - $repo $suite
+       sudo tar --numeric-owner -c . | $docker import - $repo:$suite
        
        # test the image
        $docker run -i -t $repo:$suite echo success
@@ -202,25 +202,25 @@ else
                        Debian)
                                if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then
                                        # tag latest
-                                       $docker tag $repo:$suite $repo latest
+                                       $docker tag $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 $repo:$suite $repo:$ver
                                        fi
                                fi
                                ;;
                        Ubuntu)
                                if [ "$suite" = "$ubuntuLatestLTS" ]; then
                                        # tag latest
-                                       $docker tag $repo:$suite $repo latest
+                                       $docker tag $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 $repo:$suite $repo:$lsbRelease
                                        fi
                                fi
                                ;;