Remove Chef and Puppet from williamyeh/ubuntu-trusty64-docker

William-Yeh · Jan 7, 2015 · f54ea58 · f54ea58
1 parent b8f0353
commit f54ea58
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -16,9 +16,9 @@ Use the following public box names (all available from [Vagrant Cloud](https://v
 
 - Ubuntu 14.04.1 LTS ("Trusty") x64:
 
-  - [`williamyeh/ubuntu-trusty64-docker`](https://vagrantcloud.com/williamyeh/ubuntu-trusty64-docker)
+  - [`williamyeh/ubuntu-trusty64-docker`](https://vagrantcloud.com/williamyeh/ubuntu-trusty64-docker), basically [ubuntu/trusty64](https://vagrantcloud.com/ubuntu/boxes/trusty64) + Docker - Chef - Puppet
 
-  - [`williamyeh/insecure-registry`](https://vagrantcloud.com/williamyeh/insecure-registry), basically `williamyeh/ubuntu-trusty64-docker` + [Docker Registry](https://github.com/docker/docker-registry) - Chef - Puppet
+  - [`williamyeh/insecure-registry`](https://vagrantcloud.com/williamyeh/insecure-registry), basically `williamyeh/ubuntu-trusty64-docker` + [Docker Registry](https://github.com/docker/docker-registry)
 
   - [`williamyeh/ubuntu-trusty64-kubernetes`](https://vagrantcloud.com/williamyeh/ubuntu-trusty64-kubernetes), basically `williamyeh/ubuntu-trusty64-docker` + Kubernetes
 
@@ -93,4 +93,4 @@ For live demo, see [Building a Docker-enabled Vagrant box for Debian jessie x86_
 
 Licensed under [MIT license](http://creativecommons.org/licenses/MIT/).
 
-Copyright © 2013+ William Yeh - [https://github.com/William-Yeh](https://github.com/William-Yeh).
+Copyright © 2013-2015 William Yeh - [https://github.com/William-Yeh](https://github.com/William-Yeh).
diff --git a/debian-jessie/vagrant-provision.sh b/debian-jessie/vagrant-provision.sh
@@ -54,6 +54,20 @@ sed -i -e \
 #sudo ufw reload
 
 
+#
+# override "insecure-registry" error for private registry to ease testing
+# @see http://stackoverflow.com/a/27163607/714426
+#
+cat << EOF_REGISTRY >> /etc/default/docker
+
+# allow HTTP access to private registry "registry.com"
+DOCKER_OPTS="--insecure-registry registry.com"
+#DOCKER_OPTS="--insecure-registry 10.0.0.0/24 --insecure-registry registry.com"
+
+EOF_REGISTRY
+
+
+
 # install Fig
 # @see http://www.fig.sh/install.html
 curl -o fig -L https://github.com/docker/fig/releases/download/$FIG_VERSION/fig-`uname -s`-`uname -m` 

diff --git a/ubuntu-trusty/vagrant-provision.sh b/ubuntu-trusty/vagrant-provision.sh
@@ -109,6 +109,7 @@ rm *.tar.gz
 # clean up
 sudo docker rm `sudo docker ps --no-trunc -a -q`
 sudo docker rmi busybox
+sudo apt-get autoremove -y chef puppet
 sudo apt-get clean
 sudo rm -f \
   /var/log/messages   \