From: Dave Wallace <dwallacelf@gmail.com>
Date: Thu, 5 Aug 2021 01:33:51 +0000 (-0400)
Subject: Fix debian-9 docker image builder
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=83d02315550f24aebc87a142bc552d2910c0698b;p=ci-management.git

Fix debian-9 docker image builder

- Docker installation no longer works on debian-9
  so don't install it when building debian-9
  executor images.

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I7896799bdc6cd1d683966b1f0951405d4967891b
---

diff --git a/docker/scripts/lib_apt.sh b/docker/scripts/lib_apt.sh
index 099a85a68..69c2d27cf 100644
--- a/docker/scripts/lib_apt.sh
+++ b/docker/scripts/lib_apt.sh
@@ -197,11 +197,9 @@ RUN apt-get update -qq \\
   && curl -L https://packagecloud.io/fdio/master/gpgkey | apt-key add - \\
   && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | bash \\
 EOF
-    # Hack to prevent failure on debian-9 build
+    # Docker installation script fails on debian-9, so don't install docker
     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
+    if ! grep -qe 'debian:9' "$DOCKERFILE" ; then
         echo "  && curl -fsSL https://get.docker.com | sh \ " >>"$DOCKERFILE"
     fi