Commit 8a3108f
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -310,4 +310,4 @@ do_install() { | |||
| 310 | 310 | ||
| 311 | 311 | # wrapped up in a function so that we have some protection against only getting | |
| 312 | 312 | # half the file during "curl | sh" | |
| 313 | - do_install | ||
| 313 | + do_install | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -3,6 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | 4 | sudo apt-get install -y -q ca-certificates | |
| 5 | 5 | ||
| 6 | + export HOST_PORT=2375 | ||
| 6 | 7 | echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-certificates.crt | |
| 7 | 8 | ||
| 8 | 9 | ||
@@ -21,7 +22,10 @@ sudo -E apt-get install -q -y wget | |||
| 21 | 22 | sudo -E apt-get -q -y --purge remove docker-engine | |
| 22 | 23 | sudo -E apt-cache policy docker-engine | |
| 23 | 24 | ||
| 24 | - ./get-docker-com.sh | ||
| 25 | + ./.travis/get-docker-com.sh | ||
| 26 | + | ||
| 27 | + sudo -E stop docker | ||
| 28 | + | ||
| 25 | 29 | #mkdir "${HOME}/.cache" || : | |
| 26 | 30 | #pushd "${HOME}/.cache" | |
| 27 | 31 | # wget -N "https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}_amd64.deb" | |
@@ -31,10 +35,49 @@ sudo -E apt-cache policy docker-engine | |||
| 31 | 35 | #rm -f "src/test/resources/logback.xml" | |
| 32 | 36 | mv "src/test/resources/travis-logback.xml" "src/test/resources/logback.xml" | |
| 33 | 37 | ||
| 34 | - echo 'DOCKER_OPTS="-H=unix:///var/run/docker.sock -H=tcp://127.0.0.1:2375"' | sudo tee -a /etc/default/docker | ||
| 35 | - sudo -E restart docker | ||
| 36 | - sleep 10 | ||
| 37 | - docker version | ||
| 38 | + # https://github.com/docker/docker/issues/18113 | ||
| 39 | + sudo rm /var/lib/docker/network/files/local-kv.db | ||
| 40 | + | ||
| 41 | + sudo cat /etc/default/docker | ||
| 42 | + | ||
| 43 | + cat << EOF | sudo tee /etc/default/docker | ||
| 44 | + DOCKER_OPTS="\ | ||
| 45 | + --dns 8.8.8.8 \ | ||
| 46 | + --dns 8.8.4.4 \ | ||
| 47 | + -D \ | ||
| 48 | + -H=unix:///var/run/docker.sock \ | ||
| 49 | + -H=tcp://0.0.0.0:${HOST_PORT} \ | ||
| 50 | + " | ||
| 51 | + EOF | ||
| 52 | + | ||
| 53 | + sudo cat /etc/default/docker | ||
| 54 | + sudo bash -c ':> /var/log/upstart/docker.log' | ||
| 55 | + | ||
| 56 | + date | ||
| 57 | + sudo -E start docker | ||
| 58 | + | ||
| 59 | + tries=20 | ||
| 60 | + sleep=5 | ||
| 61 | + for i in $(seq 1 $tries); do | ||
| 62 | + if sudo grep "API listen on" /var/log/upstart/docker.log ; then | ||
| 63 | + echo "Docker started. Delay $(($i * $sleep))" | ||
| 64 | + break | ||
| 65 | + elif [[ $i -ge $tries ]]; then | ||
| 66 | + echo "Docker didn't start. Exiting!" | ||
| 67 | + sudo cat /var/log/upstart/docker.log | ||
| 68 | + exit 1 | ||
| 69 | + else | ||
| 70 | + echo "Docker didn't start, sleeping for 5 secs..." | ||
| 71 | + sleep $sleep | ||
| 72 | + fi | ||
| 73 | + done | ||
| 74 | + | ||
| 75 | + | ||
| 76 | + sudo ss -antpl | ||
| 77 | + | ||
| 78 | + curl -V | ||
| 79 | + | ||
| 80 | + docker version || sudo cat /var/log/upstart/docker.log | ||
| 38 | 81 | docker info | |
| 39 | 82 | ||
| 40 | 83 | set +u | |
0 commit comments