From ef20caf57dd153044998ba595eaee95e04f06c2a Mon Sep 17 00:00:00 2001 From: Nebel54 Date: Thu, 8 Oct 2015 15:04:24 +0200 Subject: [PATCH 01/12] Fixed Version requirements for Vagrant and Virtual Box. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ccda5e4..0c6648b 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ The stock boot2docker currently mounts host volumes via the default VirtualBox G ## Prerequisites -1. [VirtualBox](https://www.virtualbox.org/) 1.7.3+ -2. [Vagrant](https://www.vagrantup.com/) 5.0+ +1. [VirtualBox](https://www.virtualbox.org/) 5.0+ +2. [Vagrant](https://www.vagrantup.com/) 1.7.3+ 3. [Babun](http://babun.github.io) - A Linux-type shell, **Windows only** Proceed to [Setup and usage](#setup) if you already have all prerequisites installed or prefer to install some/all manually. From 22b7dc451226b62c6a800ad1fd89ba42c0464559 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 12 Oct 2015 08:55:21 -0400 Subject: [PATCH 02/12] nfs2 synced folders option with optimized NFS settings, experimental. --- Vagrantfile | 7 +++++++ vagrant.yml | 1 + 2 files changed, 8 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index be4e066..03c7f9f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -125,6 +125,13 @@ Vagrant.configure("2") do |config| mount_options: ["nolock", "vers=3", "tcp"] config.nfs.map_uid = Process.uid config.nfs.map_gid = Process.gid + # nfs: better performance on Mac + elsif synced_folders['type'] == "nfs2" && !is_windows + config.vm.synced_folder vagrant_root, vagrant_mount_point, + type: "nfs", + mount_options: ["nolock", "noacl", "nocto", "noatime", "nodiratime", "vers=3", "tcp"] + config.nfs.map_uid = Process.uid + config.nfs.map_gid = Process.gid # smb: better performance on Windows. Requires Vagrant to be run with admin privileges. elsif synced_folders['type'] == "smb" && is_windows config.vm.synced_folder vagrant_root, vagrant_mount_point, diff --git a/vagrant.yml b/vagrant.yml index 70d5b29..bf3970d 100644 --- a/vagrant.yml +++ b/vagrant.yml @@ -1,6 +1,7 @@ # Sync folders configuration synced_folders: # nfs: better performance on Mac, recommended. + # nfs2: optimized NFS settings, experimental. # smb: better performance on Windows. Requires Vagrant to be run with admin privileges. # smb2: experimental, does not require running vagrant as admin. # rsync: the best performance, cross-platform platform, one-way only. Run `vagrant rsync-auto` to start auto sync. From e1118c0b481bab8d278aa70236edb2725ecf9731 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 16 Oct 2015 17:02:28 -0400 Subject: [PATCH 03/12] Use nfs2 by default --- Vagrantfile | 2 +- vagrant.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 03c7f9f..58dceae 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -125,7 +125,7 @@ Vagrant.configure("2") do |config| mount_options: ["nolock", "vers=3", "tcp"] config.nfs.map_uid = Process.uid config.nfs.map_gid = Process.gid - # nfs: better performance on Mac + # nfs2: better performance on Mac, experimental elsif synced_folders['type'] == "nfs2" && !is_windows config.vm.synced_folder vagrant_root, vagrant_mount_point, type: "nfs", diff --git a/vagrant.yml b/vagrant.yml index bf3970d..009fa3a 100644 --- a/vagrant.yml +++ b/vagrant.yml @@ -7,7 +7,7 @@ synced_folders: # rsync: the best performance, cross-platform platform, one-way only. Run `vagrant rsync-auto` to start auto sync. # When using rsync sync type the "folders" list below is mandatory. # vboxfs (or leave empty): best compatibility and ease of setup, but poor performance. - type: 'nfs' + type: 'nfs2' # smb_user, smb_password - The username and password used for authentication to mount the SMB mount. # This is usually your Windows username and password, unless you created a dedicated user for vagrant. # If using the 'smb2' type above the user and share will be configured automatically. From 96f7dbe14598719593db5ec2fcf7acdfd02aabad Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 16 Oct 2015 20:28:04 -0400 Subject: [PATCH 04/12] Switch to stable tags for dns-discovery and nginx-proxy --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 58dceae..2d881c0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -238,7 +238,7 @@ Vagrant.configure("2") do |config| docker rm -f dns > /dev/null 2>&1 || true docker run -d --name dns -p $1:53:53/udp -p 172.17.42.1:53:53/udp --cap-add=NET_ADMIN \ -v /var/run/docker.sock:/var/run/docker.sock \ - blinkreaction/dns-discovery@sha256:4c0bc8f1abca904020459c6196cc547d0783d921abcf1495fdffe2e862dfdf86 > /dev/null + blinkreaction/dns-discovery:stable > /dev/null SCRIPT s.args = "#{box_ip}" end @@ -251,7 +251,7 @@ Vagrant.configure("2") do |config| echo "Starting system-wide HTTP/HTTPS reverse proxy on $1... " docker rm -f vhost-proxy > /dev/null 2>&1 || true docker run -d --name vhost-proxy -p $1:80:80 -p $1:443:443 -v /var/run/docker.sock:/tmp/docker.sock \ - blinkreaction/nginx-proxy@sha256:04d1790726a252d6d2f89c5702533e174c284fd34dcb5599d6881da34354f30e > /dev/null + blinkreaction/nginx-proxy:stable > /dev/null SCRIPT s.args = "#{box_ip}" end From 80154da46490b5405767a3ed63901a2e25f5363d Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 16 Oct 2015 20:31:01 -0400 Subject: [PATCH 05/12] Moving scripts --- presetup-mac.sh => scripts/presetup-mac.sh | 0 presetup-win.cmd => scripts/presetup-win.cmd | 0 presetup-win.sh => scripts/presetup-win.sh | 0 presetup-win.vbs => scripts/presetup-win.vbs | 0 setup.sh => scripts/setup.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename presetup-mac.sh => scripts/presetup-mac.sh (100%) rename presetup-win.cmd => scripts/presetup-win.cmd (100%) rename presetup-win.sh => scripts/presetup-win.sh (100%) rename presetup-win.vbs => scripts/presetup-win.vbs (100%) rename setup.sh => scripts/setup.sh (100%) diff --git a/presetup-mac.sh b/scripts/presetup-mac.sh similarity index 100% rename from presetup-mac.sh rename to scripts/presetup-mac.sh diff --git a/presetup-win.cmd b/scripts/presetup-win.cmd similarity index 100% rename from presetup-win.cmd rename to scripts/presetup-win.cmd diff --git a/presetup-win.sh b/scripts/presetup-win.sh similarity index 100% rename from presetup-win.sh rename to scripts/presetup-win.sh diff --git a/presetup-win.vbs b/scripts/presetup-win.vbs similarity index 100% rename from presetup-win.vbs rename to scripts/presetup-win.vbs diff --git a/setup.sh b/scripts/setup.sh similarity index 100% rename from setup.sh rename to scripts/setup.sh From 95583e92300cc2fd47558ba11eab27cb3c2f3275 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 16 Oct 2015 20:39:39 -0400 Subject: [PATCH 06/12] Update script URLs --- scripts/presetup-win.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/presetup-win.sh b/scripts/presetup-win.sh index 7995ba5..2b06a6e 100644 --- a/scripts/presetup-win.sh +++ b/scripts/presetup-win.sh @@ -11,8 +11,8 @@ else fi # Install prerequisites via choco (virtualbox and vagrant) -curl -L https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/presetup-win.cmd -o $WINDIR/Temp/presetup-win.cmd -curl -L https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/presetup-win.vbs -o $WINDIR/Temp/presetup-win.vbs +curl -L https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/scripts/presetup-win.cmd -o $WINDIR/Temp/presetup-win.cmd +curl -L https://raw.githubusercontent.com/blinkreaction/boot2docker-vagrant/${B2D_BRANCH}/scripts/presetup-win.vbs -o $WINDIR/Temp/presetup-win.vbs echo "Setup needs administrator privileges to contiue..." cscript $WINDIR/Temp/presetup-win.vbs From a53619c870497e281b9a769a2721ff35af365cd5 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 16 Oct 2015 20:40:35 -0400 Subject: [PATCH 07/12] Bump Docker to v1.8.3, Docker Compose to v1.4.2 --- scripts/presetup-mac.sh | 4 ++-- scripts/presetup-win.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/presetup-mac.sh b/scripts/presetup-mac.sh index e9de2b7..065a056 100755 --- a/scripts/presetup-mac.sh +++ b/scripts/presetup-mac.sh @@ -1,7 +1,7 @@ #!/bin/bash -DOCKER_VERSION=1.8.1 -DOCKER_COMPOSE_VERSION=1.4.0 +DOCKER_VERSION=1.8.3 +DOCKER_COMPOSE_VERSION=1.4.2 # Console colors red='\033[0;31m' diff --git a/scripts/presetup-win.sh b/scripts/presetup-win.sh index 2b06a6e..72f911c 100644 --- a/scripts/presetup-win.sh +++ b/scripts/presetup-win.sh @@ -1,7 +1,7 @@ #!/bin/bash -DOCKER_VERSION=1.8.1 -DOCKER_COMPOSE_VERSION=1.4.0 +DOCKER_VERSION=1.8.3 +DOCKER_COMPOSE_VERSION=1.4.2 # For testing if [ ! $B2D_BRANCH == "" ]; then From a9b8fdfee7ae680209956e064dcc34812bba98ce Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Wed, 21 Oct 2015 23:49:31 -0400 Subject: [PATCH 08/12] Manually set upstream DNS server for dns-discovery container --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 2d881c0..9e01c02 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -237,7 +237,7 @@ Vagrant.configure("2") do |config| echo "Starting system-wide DNS service... " docker rm -f dns > /dev/null 2>&1 || true docker run -d --name dns -p $1:53:53/udp -p 172.17.42.1:53:53/udp --cap-add=NET_ADMIN \ - -v /var/run/docker.sock:/var/run/docker.sock \ + --dns 8.8.8.8 -v /var/run/docker.sock:/var/run/docker.sock \ blinkreaction/dns-discovery:stable > /dev/null SCRIPT s.args = "#{box_ip}" From 08f92b42a6b58e5c05400025640f274c47e33fc7 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Sun, 25 Oct 2015 19:16:19 -0400 Subject: [PATCH 09/12] Bump base box to v1.8.3 --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 9e01c02..2e3942c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -98,7 +98,7 @@ Vagrant.configure("2") do |config| config.vm.define "boot2docker" config.vm.box = "blinkreaction/boot2docker" - config.vm.box_version = "1.8.2" + config.vm.box_version = "1.8.3" config.vm.box_check_update = true ## Network ## From 71453331a7cf6309b242ab63ca8db03abdd280ad Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Sun, 25 Oct 2015 19:16:38 -0400 Subject: [PATCH 10/12] Bump vagrant version requirement --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 2e3942c..46c32d4 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -92,7 +92,7 @@ end ###################################################################### # Vagrant Box Configuration # -Vagrant.require_version ">= 1.6.3" +Vagrant.require_version ">= 1.7.3" Vagrant.configure("2") do |config| config.vm.define "boot2docker" From 56ebb8babc4b1e8ff8dce407f538e601d0353200 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 26 Oct 2015 17:36:18 -0400 Subject: [PATCH 11/12] Switch dns discovery and vhost-proxy containers to image digests for the respective releases. --- Vagrantfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 46c32d4..cb52504 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -232,26 +232,28 @@ Vagrant.configure("2") do |config| end # System-wide dnsmasq service for DNS discovery and name resolution + # Image: blinkreaction/dns-discovery v1.0.0 config.vm.provision "shell", run: "always", privileged: false do |s| s.inline = <<-SCRIPT echo "Starting system-wide DNS service... " docker rm -f dns > /dev/null 2>&1 || true docker run -d --name dns -p $1:53:53/udp -p 172.17.42.1:53:53/udp --cap-add=NET_ADMIN \ --dns 8.8.8.8 -v /var/run/docker.sock:/var/run/docker.sock \ - blinkreaction/dns-discovery:stable > /dev/null + blinkreaction/dns-discovery@sha256:f1322ab6d5496c8587e59e47b0a8b1479a444098b40ddd598e85e9ab4ce146d8 > /dev/null SCRIPT s.args = "#{box_ip}" end # System-wide vhost-proxy service. # Containers must define a "VIRTUAL_HOST" environment variable to be recognized and routed by the vhost-proxy. + # Image: blinkreaction/nginx-proxy v1.1.0 if $vconfig['vhost_proxy'] config.vm.provision "shell", run: "always", privileged: false do |s| s.inline = <<-SCRIPT echo "Starting system-wide HTTP/HTTPS reverse proxy on $1... " docker rm -f vhost-proxy > /dev/null 2>&1 || true docker run -d --name vhost-proxy -p $1:80:80 -p $1:443:443 -v /var/run/docker.sock:/tmp/docker.sock \ - blinkreaction/nginx-proxy:stable > /dev/null + blinkreaction/nginx-proxy@sha256:1707c0fd2fa4f0e98a656f748a4edb8a04578e9dc63115acc23a05225f151e04 > /dev/null SCRIPT s.args = "#{box_ip}" end From 4db5ccbeeb533ca564fe4b00b2d85e349a7a1f9a Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Mon, 26 Oct 2015 17:36:36 -0400 Subject: [PATCH 12/12] Bump to v1.2.0 --- CHANGELOG.md | 10 ++++++++++ VERSION | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a173c1c..cfceaff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## 1.2.0 (2015-10-26) + +- Switched to new base box version 1.8.3 + - Docker v1.8.3, Docker Compose v1.4.2 + - SFTP support (user: docker, password: tcuser or using vagrants insecure key) +- Added nfs2 synced folders option with optimized NFS settings (experimental and default) +- Switched to vhost-proxy [v1.1.0](https://github.com/blinkreaction/docker-nginx-proxy/releases/tag/v1.1.0) and dns-discovery [v1.0.0](https://github.com/blinkreaction/docker-dns-discovery/releases/tag/v1.0.0) container images +- Moved scripts to a subfolder +- Fixed Version requirements for Vagrant and Virtual Box + ## 1.1.1 (2015-10-01) - Fix path to VBoxManage on Windows diff --git a/VERSION b/VERSION index 524cb55..26aaba0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.1 +1.2.0