diff options
| author | Dillon Dixon <dillondixon@gmail.com> | 2016-07-10 18:39:52 -0700 |
|---|---|---|
| committer | Dillon Dixon <dillondixon@gmail.com> | 2016-07-10 18:47:14 -0700 |
| commit | 9b5622a6df9d73ba5aaf246ecc87138cf93e48f2 (patch) | |
| tree | 7f55ab6c5007bbcbcad00e2d064029f8813c273c /contrib/mkimage-arch.sh | |
| parent | 84d285d28f4f8091b76a8b09e2f3b399cb33c626 (diff) | |
| download | docker-9b5622a6df9d73ba5aaf246ecc87138cf93e48f2.tar.gz | |
Changed to 1800 second timeout for all ARMV*
Signed-off-by: Dillon Dixon <dillondixon@gmail.com>
Diffstat (limited to 'contrib/mkimage-arch.sh')
| -rwxr-xr-x | contrib/mkimage-arch.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/mkimage-arch.sh b/contrib/mkimage-arch.sh index 5692a1b104..f941177122 100755 --- a/contrib/mkimage-arch.sh +++ b/contrib/mkimage-arch.sh @@ -63,11 +63,7 @@ case "$arch" in sed "s/Architecture = armv/Architecture = armv${version}h/g" './mkimage-archarm-pacman.conf' > "${PACMAN_CONF}" PACMAN_MIRRORLIST='Server = http://mirror.archlinuxarm.org/$arch/$repo' PACMAN_EXTRA_PKGS='archlinuxarm-keyring' - if [ "$version" -lt 7 ]; then - EXPECT_TIMEOUT=1800 # Some armv6 based devices can be very slow (e.g. RPiv1) - else - EXPECT_TIMEOUT=120 - fi + EXPECT_TIMEOUT=1800 # Most armv* based devices can be very slow (e.g. RPiv1) ARCH_KEYRING=archlinuxarm DOCKER_IMAGE_NAME="armv${version}h/archlinux" ;; |