From bca78b5a9de4bfe1a1f4fe8c4b2e071c27250ac0 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Fri, 27 Jan 2017 13:15:01 -0800 Subject: [PATCH] fix return code of retry loop --- ros_buildfarm/templates/snippet/install_python3.Dockerfile.em | 2 +- ros_buildfarm/templates/snippet/setup_locale.Dockerfile.em | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ros_buildfarm/templates/snippet/install_python3.Dockerfile.em b/ros_buildfarm/templates/snippet/install_python3.Dockerfile.em index 0cac942e5..881393af5 100644 --- a/ros_buildfarm/templates/snippet/install_python3.Dockerfile.em +++ b/ros_buildfarm/templates/snippet/install_python3.Dockerfile.em @@ -1,4 +1,4 @@ @[if os_name == 'debian' or os_name == 'ubuntu' and os_code_name in ['saucy', 'vivid', 'wily', 'xenial']]@ @# Ubuntu Saucy, Vivid and newer have neither Python 2 nor 3 installed by default -RUN for i in 1 2 3; do apt-get update && apt-get install -q -y python3 && apt-get clean && break || sleep 5; done +RUN for i in 1 2 3; do apt-get update && apt-get install -q -y python3 && apt-get clean && break || if [[ $i < 3 ]]; then sleep 5; else false; fi; done @[end if]@ diff --git a/ros_buildfarm/templates/snippet/setup_locale.Dockerfile.em b/ros_buildfarm/templates/snippet/setup_locale.Dockerfile.em index 22c3b6c0f..d0b488529 100644 --- a/ros_buildfarm/templates/snippet/setup_locale.Dockerfile.em +++ b/ros_buildfarm/templates/snippet/setup_locale.Dockerfile.em @@ -1,6 +1,6 @@ @[if os_name == 'debian']@ @# Debian does not have locales installed by default but ubuntu does -RUN for i in 1 2 3; do apt-get update && apt-get install -q -y locales && apt-get clean && break || sleep 5; done +RUN for i in 1 2 3; do apt-get update && apt-get install -q -y locales && apt-get clean && break || if [[ $i < 3 ]]; then sleep 5; else false; fi; done RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen @[end if]@ RUN locale-gen en_US.UTF-8