issue apache#2 support docker 1.10 in ubuntu setup

jeremiaswerner · Mar 24, 2016 · a2a061b · a2a061b
1 parent b8c4c97
commit a2a061b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/tools/macos/tweak-dockermachine.sh b/tools/macos/tweak-dockermachine.sh
@@ -5,6 +5,12 @@
 # Set this to the name of the docker-machine VM.
 MACHINE_NAME=whisk
 
+# configure user namespaces
+sudo addgroup -g 2000 openwhisk
+sudo adduser -g "" -G openwhisk -D -u 2000 openwhisk
+
+docker-machine ssh $MACHINE_NAME "sudo sed -i -e 's/--label provider=virtualbox/--label provider=virtualbox\n--userns-remap=2000:2000/g' /var/lib/boot2docker/profile"
+
 # Disable TLS.
 docker-machine ssh $MACHINE_NAME "echo DOCKER_TLS=no |sudo tee -a /var/lib/boot2docker/profile > /dev/null"
 docker-machine ssh $MACHINE_NAME "echo DOCKER_HOST=\'-H tcp://0.0.0.0:2375\' |sudo tee -a /var/lib/boot2docker/profile > /dev/null"

diff --git a/tools/ubuntu-setup/docker.sh b/tools/ubuntu-setup/docker.sh
@@ -2,26 +2,23 @@
 
 set -ex
 
-sudo apt-get -y install apt-transport-https
+sudo apt-get -y install apt-transport-https ca-certificates
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-sudo sh -c "echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list"
+sudo sh -c "echo deb https://apt.dockerproject.org/repo ubuntu-trusty main  > /etc/apt/sources.list.d/docker.list"
 sudo apt-get -y update -qq
 
+sudo apt-get purge lxc-docker
+sudo apt-cache policy docker-engine
+
 # AUFS
 sudo apt-get -y install linux-image-extra-$(uname -r)
 
 # DOCKER
-sudo apt-get install -q -y --force-yes lxc-docker-1.9.0
+#sudo apt-get install -q -y --force-yes lxc-docker-1.10.3
+sudo apt-get install -y --force-yes docker-engine
 
 # enable (security - use 127.0.0.1)
-#echo 'DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --api-enable-cors"' >> /etc/default/docker
-#echo 'DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --api-enable-cors"' >> /etc/default/docker
-#echo 'DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --api-enable-cors"' >> /etc/default/docker
-#echo 'DOCKER_OPTS="-H tcp://172.17.42.1:4243 --api-enable-cors"' >> /etc/default/docker
-#echo 'DOCKER_OPTS="-H tcp://172.17.42.1:4243 -H unix:///var/run/docker.sock --api-enable-cors"' >> /etc/default/docker
-#echo 'DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --api-enable-cors --storage-driver=aufs"' >> /etc/default/docker
 sudo -E bash -c 'echo '\''DOCKER_OPTS="-H tcp://0.0.0.0:4243 -H unix:///var/run/docker.sock --api-enable-cors --storage-driver=aufs"'\'' >> /etc/default/docker'
-
 sudo gpasswd -a vagrant docker
 
 sudo service docker restart