|
...
|
...
|
@@ -192,7 +192,7 @@ if [ "$justTar" ]; then
|
|
192
|
192
|
sudo tar --numeric-owner -caf "$repo" .
|
|
193
|
193
|
else
|
|
194
|
194
|
# create the image (and tag $repo:$suite)
|
|
195
|
|
- sudo tar --numeric-owner -c . | $docker import - $repo $suite
|
|
|
195
|
+ sudo tar --numeric-owner -c . | $docker import - $repo:$suite
|
|
196
|
196
|
|
|
197
|
197
|
# test the image
|
|
198
|
198
|
$docker run -i -t $repo:$suite echo success
|
|
...
|
...
|
@@ -202,25 +202,25 @@ else
|
|
202
|
202
|
Debian)
|
|
203
|
203
|
if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then
|
|
204
|
204
|
# tag latest
|
|
205
|
|
- $docker tag $repo:$suite $repo latest
|
|
|
205
|
+ $docker tag $repo:$suite $repo:latest
|
|
206
|
206
|
|
|
207
|
207
|
if [ -r etc/debian_version ]; then
|
|
208
|
208
|
# tag the specific debian release version (which is only reasonable to tag on debian stable)
|
|
209
|
209
|
ver=$(cat etc/debian_version)
|
|
210
|
|
- $docker tag $repo:$suite $repo $ver
|
|
|
210
|
+ $docker tag $repo:$suite $repo:$ver
|
|
211
|
211
|
fi
|
|
212
|
212
|
fi
|
|
213
|
213
|
;;
|
|
214
|
214
|
Ubuntu)
|
|
215
|
215
|
if [ "$suite" = "$ubuntuLatestLTS" ]; then
|
|
216
|
216
|
# tag latest
|
|
217
|
|
- $docker tag $repo:$suite $repo latest
|
|
|
217
|
+ $docker tag $repo:$suite $repo:latest
|
|
218
|
218
|
fi
|
|
219
|
219
|
if [ -r etc/lsb-release ]; then
|
|
220
|
220
|
lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
|
|
221
|
221
|
if [ "$lsbRelease" ]; then
|
|
222
|
222
|
# tag specific Ubuntu version number, if available (12.04, etc.)
|
|
223
|
|
- $docker tag $repo:$suite $repo $lsbRelease
|
|
|
223
|
+ $docker tag $repo:$suite $repo:$lsbRelease
|
|
224
|
224
|
fi
|
|
225
|
225
|
fi
|
|
226
|
226
|
;;
|