diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2016-01-17 19:18:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-17 19:18:59 +0000 |
| commit | 58ab9100f56b4252578c9c13cb8060d87285f1ba (patch) | |
| tree | 8294e825620f38d7be12875b0bb3e7db0aa7683e /build/fuel-main_6.patch | |
| parent | 76aa5bd1daf9568ab91f7586b0627062ffb26fb0 (diff) | |
| parent | 8e599759ede512a773eccef59eb2824940307564 (diff) | |
Merge "Fuel 8 uplift"
Diffstat (limited to 'build/fuel-main_6.patch')
| -rw-r--r-- | build/fuel-main_6.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/build/fuel-main_6.patch b/build/fuel-main_6.patch deleted file mode 100644 index 2659e2d17..000000000 --- a/build/fuel-main_6.patch +++ /dev/null @@ -1,30 +0,0 @@ -*** prepare-build-env.sh.orig Mon Oct 19 13:28:30 2015 ---- prepare-build-env.sh Mon Oct 19 13:29:10 2015 -*************** -*** 87,92 **** ---- 87,93 ---- - echo "Docker is running." - else - echo "Process is not running, starting it..." -+ sudo sh -c 'echo DOCKER_OPTS=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" >> /etc/default/docker*' - sudo service docker start - fi - else -*************** -*** 102,108 **** - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 - # Install docker - sudo apt-get update -! sudo apt-get -y install lxc-docker-1.5.0 - fi - - # Install software ---- 103,110 ---- - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 - # Install docker - sudo apt-get update -! sudo sh -c 'echo DOCKER_OPTS=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" > /etc/default/docker' -! sudo apt-get -y -o Dpkg::Options::="--force-confold" install lxc-docker-1.5.0 - fi - - # Install software |