diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-11-25 11:32:57 +0100 |
|---|---|---|
| committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-11-27 10:24:23 +0100 |
| commit | 24a95306d2564b272b5320e9149d9aea70b4061c (patch) | |
| tree | 8c1a2c9f7acbfed41f8ebc56a8ae1f7d316f7cff /build/fuel-main_6.patch | |
| parent | 7077376d6e0ff0dec77080fa21b75911b811475d (diff) | |
Restructcture of the directory layout
Restructure of the directory layout due to move of Fuel into it's own repo
JIRA: FUEL-85
Change-Id: I3647e1992a508f29dce06a5d6c790725c527f6f5
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'build/fuel-main_6.patch')
| -rw-r--r-- | build/fuel-main_6.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/build/fuel-main_6.patch b/build/fuel-main_6.patch new file mode 100644 index 000000000..2659e2d17 --- /dev/null +++ b/build/fuel-main_6.patch @@ -0,0 +1,30 @@ +*** 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 |