|
@@ -192,7 +192,7 @@ if [ "$justTar" ]; then
|
|
sudo tar --numeric-owner -caf "$repo" .
|
|
sudo tar --numeric-owner -caf "$repo" .
|
|
else
|
|
else
|
|
# create the image (and tag $repo:$suite)
|
|
# 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
|
|
# test the image
|
|
$docker run -i -t $repo:$suite echo success
|
|
$docker run -i -t $repo:$suite echo success
|
|
@@ -202,25 +202,25 @@ else
|
|
Debian)
|
|
Debian)
|
|
if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then
|
|
if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then
|
|
# tag latest
|
|
# tag latest
|
|
- $docker tag $repo:$suite $repo latest
|
|
|
|
|
|
+ $docker tag $repo:$suite $repo:latest
|
|
|
|
|
|
if [ -r etc/debian_version ]; then
|
|
if [ -r etc/debian_version ]; then
|
|
# tag the specific debian release version (which is only reasonable to tag on debian stable)
|
|
# tag the specific debian release version (which is only reasonable to tag on debian stable)
|
|
ver=$(cat etc/debian_version)
|
|
ver=$(cat etc/debian_version)
|
|
- $docker tag $repo:$suite $repo $ver
|
|
|
|
|
|
+ $docker tag $repo:$suite $repo:$ver
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
;;
|
|
;;
|
|
Ubuntu)
|
|
Ubuntu)
|
|
if [ "$suite" = "$ubuntuLatestLTS" ]; then
|
|
if [ "$suite" = "$ubuntuLatestLTS" ]; then
|
|
# tag latest
|
|
# tag latest
|
|
- $docker tag $repo:$suite $repo latest
|
|
|
|
|
|
+ $docker tag $repo:$suite $repo:latest
|
|
fi
|
|
fi
|
|
if [ -r etc/lsb-release ]; then
|
|
if [ -r etc/lsb-release ]; then
|
|
lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
|
|
lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
|
|
if [ "$lsbRelease" ]; then
|
|
if [ "$lsbRelease" ]; then
|
|
# tag specific Ubuntu version number, if available (12.04, etc.)
|
|
# tag specific Ubuntu version number, if available (12.04, etc.)
|
|
- $docker tag $repo:$suite $repo $lsbRelease
|
|
|
|
|
|
+ $docker tag $repo:$suite $repo:$lsbRelease
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
;;
|
|
;;
|