diff options
| author |   Vanessa Valderrama <vvalderrama@linuxfoundation.org> | 2021-08-13 19:57:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2021-08-13 19:57:15 +0000 |
| commit | fa5e3cd03be280f52b29c3b4ddcb302c4117e79f (patch) | |
| tree | dc3ac57c70ba4dfe959f2d8556076e2d4f46e2ab | |
| parent | 2b2f41026a7296b01c4fa94f54d90854912e1f2a (diff) | |
| parent | 83d02315550f24aebc87a142bc552d2910c0698b (diff) | |
Merge "Fix debian-9 docker image builder"
| -rw-r--r-- | docker/scripts/lib_apt.sh | 6 |
1 files changed, 2 insertions, 4 deletions
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 |