dockly 2.5.1 → 2.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +8 -8
- data/lib/dockly/version.rb +1 -1
- data/snippets/s3_diff_docker_import.erb +2 -3
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
MGE4OTRkYmEzOTkwYTJlOTVhNDA4MDQxYzA3ODM3NGZlNzFmYWY1Yg==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
NGYyNTIzZmU1MmFmYzcxZTk1NzMxZGM4ZDIwNDRkZTQ5YjFiOTZhYw==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
YzRjMDZlZjlkZmNlYzJkZjI5YzJhYTZiMzhjNTU0ODUxMzMzNmIyNGE4NDFi
|
|
10
|
+
OWU1MjJjZGZiMTlhZTYzYzI5Y2Y0YmI2ZDNkYjk5MGU4M2MwNWI3MTdkMmRj
|
|
11
|
+
ODcwODE4NDU3YWRlOTZhYTc2YTRiNjhhNmQyZmYyNzI3MjA5ZDI=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
MWMzMGU2Zjg4NWEzMGMzNmQxZDYwNDk5NjVkMTFmNTA4ZjRiMjEyMmQxZGI2
|
|
14
|
+
M2QwNTg2MzdkMmQ5MGZlZWI3MDE1MjI0ZWYyODEwMThmNjhhZDc3NzIyNzNk
|
|
15
|
+
NTcyNzE0NDcyZmIyNjgwM2E5MjU4ZTE1MzUwMmJkZGNkYTBlMWY=
|
data/lib/dockly/version.rb
CHANGED
|
@@ -38,7 +38,7 @@ remove_bad_imports() {
|
|
|
38
38
|
log "removing bad imports"
|
|
39
39
|
images=$(docker images | grep \<none | awk '{ print $3 }')
|
|
40
40
|
if [[ "x$images" != "x" ]]; then
|
|
41
|
-
docker rmi $images
|
|
41
|
+
docker rmi $images > >(log)
|
|
42
42
|
fi
|
|
43
43
|
log "bad import removed"
|
|
44
44
|
}
|
|
@@ -54,8 +54,7 @@ log "fetch: successfully pulled base image"
|
|
|
54
54
|
worked=1
|
|
55
55
|
for attempt in {1..200}; do
|
|
56
56
|
[[ $worked != 0 ]] || break
|
|
57
|
-
stream_image | docker_import && worked=0 || (log "fetch: attempt $attempt failed, sleeping 30"; sleep 30)
|
|
58
|
-
[[ $worked != 0 ]] && remove_bad_imports
|
|
57
|
+
stream_image | docker_import && worked=0 || (remove_bad_imports; log "fetch: attempt $attempt failed, sleeping 30"; sleep 30)
|
|
59
58
|
done
|
|
60
59
|
[[ $worked != 0 ]] && fatal "fetch: failed to import diff image"
|
|
61
60
|
log "fetch: successfully imported diff image"
|