Browse Source

really install curl inside docker

Jorge Aparicio 8 years ago
parent
commit
4b453fbd0a
3 changed files with 3 additions and 2 deletions
  1. 1 0
      ci/env.sh
  2. 1 1
      ci/install.sh
  3. 1 1
      ci/script.sh

+ 1 - 0
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

+ 1 - 1
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

+ 1 - 1
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 \