aboutsummaryrefslogtreecommitdiffstats
path: root/build/fuel-main_docker_version.patch
diff options
context:
space:
mode:
Diffstat (limited to 'build/fuel-main_docker_version.patch')
-rw-r--r--build/fuel-main_docker_version.patch20
1 files changed, 0 insertions, 20 deletions
diff --git a/build/fuel-main_docker_version.patch b/build/fuel-main_docker_version.patch
deleted file mode 100644
index 22b58249b..000000000
--- a/build/fuel-main_docker_version.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-*** prepare-build-env.sh.orig 2016-01-11 14:55:50.615286910 +0100
---- prepare-build-env.sh 2016-01-11 14:59:44.775308422 +0100
-***************
-*** 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
---- 102,109 ----
- 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=\"--bip 172.45.0.1/24\" > /etc/default/docker'
-! sudo apt-get -y -o Dpkg::Options::="--force-confold" install lxc-docker-1.7.1
- fi
-
- # Install software