From 4b453fbd0aac5198cd9a77a4c575e1b33c440081 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 8 Aug 2016 21:27:08 -0500 Subject: [PATCH] really install curl inside docker --- ci/env.sh | 1 + ci/install.sh | 2 +- ci/script.sh | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/env.sh b/ci/env.sh index 7458372..f1aa4fe 100644 --- a/ci/env.sh +++ b/ci/env.sh @@ -29,6 +29,7 @@ case $TARGET in export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu ;; powerpc64le-unknown-linux-gnu) + # NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no) if [[ -z $DOCKER ]]; then export DOCKER=y fi diff --git a/ci/install.sh b/ci/install.sh index 3c87ddb..c545eed 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -3,7 +3,7 @@ set -ex . $(dirname $0)/env.sh install_deps() { - if [[ ${DOCKER} == "y" ]]; then + if [[ ${DOCKER} == "i" ]]; then apt-get install -y --no-install-recommends \ ca-certificates curl fi diff --git a/ci/script.sh b/ci/script.sh index 4a6dce7..65d74a3 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -34,7 +34,7 @@ inspect() { main() { if [[ $DOCKER == "y" ]]; then docker run \ - -e DOCKER=n \ + -e DOCKER=i \ -e TARGET=$TARGET \ -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -v $(pwd):/mnt \