diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2021-04-09 16:47:37 -0400 |
|---|---|---|
| committer | Dave Wallace <dwallacelf@gmail.com> | 2021-04-09 16:47:37 -0400 |
| commit | 563cca7716264d422882ae5fd3e81d48959f33d1 (patch) | |
| tree | d7c49b7d610e382bb68664ec8dfd936aa34a1af6 | |
| parent | 1264e9029a29f53b457d2190c7c9efccf1b12a52 (diff) | |
Fix broken docker install for debian-9 executor.
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I4766dfec19de63ba6ae7dbd86ed70f696a10f117
| -rw-r--r-- | docker/scripts/lib_apt.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh index af9da0b6..a2e5c98a 100644 --- a/docker/scripts/lib_apt.sh +++ b/docker/scripts/lib_apt.sh @@ -54,7 +54,8 @@ apt_override_cmake_install_with_pip3_version() { generate_apt_dockerfile_common() { local executor_class="$1" local executor_image="$2" - + debian_docker_inst_sed="| sed -e 's/has_rootless_extras="1"//g' | sh +" cat <<EOF >>"$DOCKERFILE" # Create download dir to cache external tarballs @@ -194,7 +195,16 @@ RUN apt-get update -qq \\ zlib1g-dev \\ && curl -L https://packagecloud.io/fdio/master/gpgkey | apt-key add - \\ && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | bash \\ - && curl -fsSL https://get.docker.com | sh \\ +EOF + # Hack to prevent failure on debian-9 build + head $DOCKERFILE + if grep -qe 'debian:9' "$DOCKERFILE" ; then + echo " && curl -fsSL https://get.docker.com | sed -e 's/has_rootless_extras=\"1\"//g' | sh \ " >>"$DOCKERFILE" + else + echo " && curl -fsSL https://get.docker.com | sh \ " >>"$DOCKERFILE" + fi + + cat <<EOF >>"$DOCKERFILE" && rm -r /var/lib/apt/lists/* # Install packages for all project branches |