-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
86 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,78 @@ | ||
| # Changelog | ||
|
|
||
| ## 28/05/2015 (dduportal-1.6.2) | ||
| - Moving boot2docker to 1.6.2 : https://github.com/boot2docker/boot2docker/releases/tag/v1.6.2 | ||
|
|
||
| ## 13/05/2015 (dduportal-1.6.1) | ||
| - Moving boot2docker to 1.6.1 : https://github.com/boot2docker/boot2docker/releases/tag/v1.6.1 | ||
| - GH-10 : Making NFS working, environment variable powered, documentation added | ||
| - Corrections around the Makefile for building yourself | ||
|
|
||
| ## 04/05/2015 (dduportal-1.6.0) | ||
| - Moving boot2docker to 1.6.0 : https://github.com/boot2docker/boot2docker/releases/tag/v1.6.0 | ||
|
|
||
| ## 15/02/2015 (v1.5.0) | ||
| - GH-6 : Adding a private id to the default private network in order to permit bypass at user level | ||
| - Moving to [docker v1.5.0](https://github.com/docker/docker/blob/master/CHANGELOG.md#150-2015-02-10) + [boot2docker v1.5.0](https://github.com/boot2docker/boot2docker/releases/tag/v1.5.0) | ||
| - Support of rsync synced folder (rsync is installed in the box) | ||
| - Removing the box-embedded iso (Is now dumped to the first partition of the HDD) | ||
| - Adding a set of integration tests usings bats for testing the box with the vagrant provider | ||
|
|
||
| ## 13/01/2015 (v1.4.1-2) | ||
| - GH-5 : NFS support for synced folder | ||
| - GH-5 : bootlocalh.sh is now working (from the vagrant synced folder) | ||
| - GH-5 : Vagrant 1.7 support : Disabling the new behaviour with ssh keys | ||
| - Adding a private network in order to ease NFS synced folder and access to VM services | ||
| - Writing some docs in order to use this VM as a remote daemon | ||
|
|
||
| ## 17/12/2014 (v1.4.1) | ||
| - Moving to boot2docker 1.4.1 (and Docker 1.4.1) | ||
|
|
||
| ## 25/11/2014 (v1.3.2) | ||
| - Moving to boot2docker 1.3.2 and Docker 1.3.2 (security issues) | ||
|
|
||
| ## 07/11/2014 (v1.3.1) | ||
| - Moving to boot2docker 1.3.1 (docker 1.3.1) | ||
| - Adding SSL docker's daemon port NAT to 2376 | ||
| - NATed ports are now auto-moved when conflicting | ||
| - Packer 0.7 compatibility | ||
| - When docker-building, AUFS limit is now 128 layers instead of 42 | ||
| - Packer-only new build process, from the vanilla boot2docker iso, checksumed | ||
| - bootlocal.sh can be used from /vagrant mount (alongside the Vagrantfile) | ||
|
|
||
| ## 13/07/2014 (v1.1.1) | ||
| - Moving to boot2docker 1.1.1 (and Docker 1.1.1 by transitivity) | ||
| - Persisting the b2d dependency into the make.sh script for easying future updates and trusting | ||
| - Moving the default RAM of the VM to 2Gb | ||
|
|
||
| ## 05/07/2014 (v1.1.0) | ||
| - Moving to docker v1.1.0 | ||
| - Moving to boot2docker v1.1.0 | ||
| - Adding some error handling when building from shell | ||
|
|
||
| ## 22/06/2014 (v1.0.1) | ||
| - Moving to docker and b2d 1.0.1 | ||
|
|
||
| ## 19/06/2014 (v1.0.0) | ||
| - Building b2d-vbox and b2d vagrant custom in one Dockerfile instead of Docker + vagrant + ubuntu | ||
| - Adding possibility to build boot2docker vanilla image from official github repo instead of pulling from Docker index | ||
| - Move to b2d and docker 1.0.0 (bash make.sh v1.0.0) | ||
|
|
||
| ## 15/06/2014 (v0.5.0) | ||
| - Moving to the new IANA Docker port 2375, and let vagrant auto corrects when collision | ||
| - Moving to boot2docker and Docker 1.0.0 | ||
| - Using a custom Vagrantfile for building a b2d iso with vbox addition | ||
| - Re-using temporarly mitchellh vagrantfile + build-iso workflow for "vagranti-zing" the b2d.iso | ||
| - Updating build scripts (Unix/Windows) with packer building all types | ||
|
|
||
| ## 08/05/2014 (v0.4.0) | ||
| - Adding auto Docker update | ||
| - Moving to Docker 0.11.1 | ||
|
|
||
| ## 07/05/2014 (v0.3.0) | ||
| - Adding linux build chain and bats tests | ||
| - Moving to official boot2docker build system | ||
| - Integrate boot2docker build into a Vagrant Docker provider | ||
| - Vboxsf build into ISO (auto) [4.3.8] | ||
|
|
||
| ## 23/04/2014 (v0.2.0) | ||
| - Adding custom_profile mangement | ||
| - Adding Windows build chain | ||
| - Adding docker and vagrant BATS tests, Windows only | ||
|
|
||
| ## 21/04/2014 (v0.1.0) | ||
|
|
||
| - Fetching latest version from mitchellh offical repository (results in using a vagrant cloud baebox with no docker) | ||
| - Updating b2d to experimental build with vboxsf inside (https://github.com/boot2docker/boot2docker/issues/282) | ||
| - Updating build-iso.sh to add a /etc/rc.d script for loading vboxsf module at boot. | ||
| - Updating basebox's vagrantfile template to enable /vagrant share | ||
| - Updating basebox's vagrantfile template to aut correct docker's TCP port when launching multiple VMs | ||
|
|
||
| ## 03/03/2014 | ||
|
|
||
| - Using misheska's ubuntu basebox for running docker easily. | ||
| - Attempts to install fig from orchardups. | ||
|
|
||
| ## v1.10.3 (2016-03-31) | ||
|
|
||
| - Built with docker-machine 0.7.0-rc1 | ||
| - Versions: boot2docker/docker 1.10.3, docker-compose 1.6.2 | ||
| - Misc fixes | ||
|
|
||
|
|
||
| ## v1.9.1-overlay (2016-01-08) | ||
|
|
||
| - Built with docker-machine v0.5.5 | ||
| - Version: docker v1.9.1, docker-compose v1.5.2 | ||
| - Changes: | ||
| - Symlink /Users and /cygdrive to the VMs permanent storage | ||
| - Switch to the overlay driver (experimental) | ||
|
|
||
|
|
||
| ## v1.9.1 (2016-01-08) | ||
|
|
||
| - Built with docker-machine v0.5.5 | ||
| - Version: docker v1.9.1, docker-compose v1.5.2 | ||
| - Changes: | ||
| - Symlink /Users and /cygdrive to the VMs permanent storage | ||
|
|
||
|
|
||
| ## v1.9.0 (2015-11-06) | ||
|
|
||
| - Buil with Docker Machine v0.5.0 | ||
| - Boot2docker/Docker v1.9.0, Docker Compose v1.5.0 | ||
| - Fixed tests: Disable vagrant-gatling-rsync autostart if installed | ||
|
|
||
|
|
||
| ## v1.8.3 (2015-10-25) | ||
|
|
||
| - Boot2docker/Docker v1.8.3 | ||
| - Docker Compose v1.4.2 | ||
| - Use a different tiny core mirror (since the primary repo is down) | ||
| - Enable SFTP support | ||
| - Start NFS client utilities at boot | ||
|
|
||
|
|
||
| ## v1.8.2 (2015-09-29) | ||
|
|
||
| - Boot2docker/Docker 1.8.2 | ||
| - Docker Compose 1.4.2 | ||
| - DNS discovery ready | ||
|
|
||
|
|
||
| ## v1.8.1 (2015-08-18) | ||
|
|
||
| - Boot2docker/Docker 1.8.1 | ||
| - Docker Compose 1.4.0 | ||
|
|
||
|
|
||
| ## v1.7.1 (2015-07-17) | ||
|
|
||
| - Boot2docker/Docker 1.7.1 | ||
| - Docker Compose 1.3.3 | ||
| - Fix compatibility with VirtualBox 5 | ||
| - Removed custom rsync binary - now available from the TinyCore repo | ||
|
|
||
|
|
||
| ## v1.7.1 (2015-07-17) | ||
|
|
||
| - Boot2docker/Docker 1.7.1 | ||
|
|
||
|
|
||
| ## v1.7.0 (2015-06-24) | ||
|
|
||
| - Boot2docker/Docker 1.7.0 | ||
|
|
||
|
|
||
| ## v1.6.2 (2015-06-09) | ||
|
|
||
| - Boot2docker/Docker 1.6.2 | ||
| - Switching to `virtio` for networking |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,15 @@ | ||
| # boot2docker Vagrant Box | ||
| # Boot2docker Vagrant Box | ||
|
|
||
| This repository contains the scripts necessary to create a Vagrant-compatible | ||
| [boot2docker](https://github.com/boot2docker/boot2docker) box and is compatible with Docker v1.6. | ||
| This is the base box repo for https://github.com/blinkreaction/boot2docker-vagrant | ||
| The box is available on Vagrant Cloud: https://atlas.hashicorp.com/blinkreaction/boxes/boot2docker | ||
|
|
||
| If you work solely with Docker, this box lets you keep your Vagrant workflow and work in the most minimal Docker environment possible. | ||
| This box is build with [Docker Machine](https://github.com/docker/machine) to maintain | ||
| close alignment with the stock boot2docker VM. | ||
|
|
||
| ## Usage | ||
|
|
||
| The box is available on [Hashicrop's Atlas](https://atlas.hashicorp.com/dduportal/boxes/boot2docker), making it very easy to use it: | ||
| ## Credits | ||
|
|
||
| $ vagrant init dduportal/boot2docker | ||
| $ vagrant up | ||
| Many thanks to @dduportal for keeping his fork of mitchellh/boot2docker-vagrant-box alive! | ||
|
|
||
| If you want the actual box source file, you can download it from the [tags page](https://github.com/dduportal/boot2docker-vagrant-box/tags). | ||
|
|
||
| On OS X, to use the docker client, follow the directions here: http://docs.docker.io/installation/mac/#docker-os-x-client (you'll need to export `DOCKER_HOST`). You should then be able to to run `docker version` from the host. [Homebrew](http://brew.sh) can also a good installation medium with ```brew update && brew install docker``` | ||
|
|
||
|
|
||
| ## Tips & tricks | ||
|
|
||
| * Vagrant synced folder has been tested with : | ||
| * vbox shared folder : This is default sharing system | ||
| * [rsync](https://docs.vagrantup.com/v2/synced-folders/rsync.html) : add this line to your Vagrantfile (it will overwrite the default vboxsf sync behaviour) : | ||
|
|
||
| ```ruby | ||
| config.vm.synced_folder ".", "/vagrant", type: "rsync" | ||
| ``` | ||
| * [NFS](https://docs.vagrantup.com/v2/synced-folders/nfs.html) : For now, use environment variable to enable NFS (Mac OS and Linux tested). It will ask for your admin password. | ||
|
|
||
| ```bash | ||
| $ export B2D_NFS_SYNC=1 | ||
| $ vagrant up | ||
| ``` | ||
|
|
||
| * If you want to tune contents (custom profile, install tools inside the VM) that do not fit into the "vagrant provisionning" lifecycle combinded with the un-persistence of boot2docker, the "bootlocal" system has been extended : | ||
| * The [boot2docker FaQ](https://github.com/boot2docker/boot2docker/blob/master/doc/FAQ.md) says that you can provide a custom script, named bootlocal.sh to execute things at the end of the boot. | ||
| * We customize in order to run that script from the /vagrant share when mounted, at the end of the boot. | ||
| * So : just place a "bootlocal.sh" script alongside your Vagrantfile to customize what's inside your b2d VM. | ||
| * If you use the VM as a remote Docker daemon in a private networked docker server you need to add in your bootlocal.sh : | ||
| (Thanks to @Freyskeyd) | ||
| ``` | ||
| # Regenerate certs for the newly created Iprivate network IP | ||
| sudo /etc/init.d/docker restart | ||
| # Copy tls certs to the vagrant share to allow host to use it | ||
| sudo cp -r /var/lib/boot2docker/tls /vagrant/ | ||
| ``` | ||
| Next, you need to configure your Docker environment : | ||
| * Export cert path: ```export DOCKER_CERT_PATH=<Absolute path to your vagrant share>/tls``` | ||
| * Export Docker host path : ```export DOCKER_HOST=tcp://192.168.10.10:2376``` (You can also use localhost if the NAT is OK) | ||
| ## Building the Box | ||
| If you want to recreate the box, rather than using the binary, then | ||
| you can use the scripts and Packer template within this repository to | ||
| do so in seconds. | ||
| To build the box, first install the following prerequisites: | ||
| * [Make as workflow engine](http://www.gnu.org/software/make/) | ||
| * [Packer as vagrant basebox builder](http://www.packer.io) (at least version 0.7.5) | ||
| * [VirtualBox as main virtualization system](http://www.virtualbox.org) (at least version 4.3.28) [VMware and Parallels not implemented yet] | ||
| * [curl for downloading things](http://curl.haxx.se) | ||
| * [bats for testing](https://github.com/sstephenson/bats) | ||
| Then follow the steps: | ||
| ``` | ||
| $ make | ||
| ... | ||
| ``` | ||
| His [box](https://github.com/dduportal/boot2docker-vagrant-box) served as the original base | ||
| for https://github.com/blinkreaction/boot2docker-vagrant. |