summaryrefslogtreecommitdiffstats
path: root/build/fuel-main_docker_version.patch
blob: 2976675bd5f3fd540bac0b065bc143d3914774ca (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
*** prepare-build-env.sh.orig	Fri Dec 18 15:04:43 2015
--- prepare-build-env.sh	Fri Dec 18 15:05:01 2015
***************
*** 104,110 ****
    # 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
--- 104,110 ----
    # 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.7.1
  fi
  
  # Install software