Merge branch 'release/0.14.6' into stable

fearenales · fearenales · commit 5f42eb65a041 · 2015-08-21T16:02:31.000-03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## dev
+
+## v0.14.6 - (2015-08-20)
+
+* Bug
+  * [Docker] Do not try to stop or kill a not running container;
+  * [VM] Fixing start in Virtual Box 5.0;
+  * [Suggesting] Fixing relative paths;
+
+* Enhancements
+  * [Docker] Adding docker version lock;
+  * [VM] Fixing removal of VM without net interface;
+
 ## v0.14.5 - (2015-08-01)
+
 * Bug
   * [Agent] Fixing bug on Docker check that caused high CPU usage;
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# azk [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/azukiapp/azk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Code Climate](https://codeclimate.com/github/azukiapp/azk/badges/gpa.svg)](https://codeclimate.com/github/azukiapp/azk)  
+# azk [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/azukiapp/azk?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Code Climate](https://codeclimate.com/github/azukiapp/azk/badges/gpa.svg)](https://codeclimate.com/github/azukiapp/azk)
 
 ### A development environment orchestration tool
 
@@ -100,7 +100,7 @@ Share the love and star us here in Github!
 Check LEGAL and LICENSE files for more information.
 
 [sos]: http://en.wikipedia.org/wiki/System_of_systems
-[docker]: http://docker.io
+[docker]: http://docker.com
 [azk_images]: http://images.azk.io
 [docker_hub]: https://registry.hub.docker.com/
 [dockerfile]: http://dockerfile.github.io
diff --git a/docs/content/en/installation/README.md b/docs/content/en/installation/README.md
@@ -6,9 +6,6 @@ The installation process will add the `azk` command to your system path, making
 
 - [Mac OS X](mac_os_x.md)
 - [Linux](linux.md)
-  - [Ubuntu Trusty](linux.html#ubuntu-trusty-1404-lts-64-bit)
-  - [Ubuntu Precise](linux.html#ubuntu-precise-1204-lts-64-bit)
-  - [Fedora](linux.html#fedora-20)
 - [Source code](source-code.md)
 - [Upgrading](upgrading.md)
 
diff --git a/docs/content/en/installation/linux.md b/docs/content/en/installation/linux.md
@@ -1,5 +1,7 @@
 # Linux
 
+> The easiest way to install azk is following [azk express installation](./README.html#azk-express-installation) section.
+
 !INCLUDE "warning.md"
 
 ## Requirements
@@ -14,9 +16,9 @@
 
 1. Install Docker:
 
-  >Note that in [Docker's installation instructions][docker_ubuntu-trusty-1404-lts-64-bit], the first part is for an Ubuntu maintained package (_docker-io_) and not to the correct version (_lxc-docker_), maintained by Docker.
+  >Note that in [Docker's installation instructions][docker_ubuntu-trusty-1404-lts-64-bit], the first part is for an Ubuntu maintained package (_docker.com_) and not to the correct version (_docker-engine_), maintained by Docker.
 
-  - Install **Docker's latest version** [lxc-docker][docker_ubuntu_14_04_maintained-package-installation] - Docker has a `curl script` for easy installation;
+  - Install **Docker's latest version** [docker-engine][docker_ubuntu_14_04_maintained-package-installation] - Docker has a `curl script` for easy installation;
   - Include your local user in the [docker group][docker_root_access]; Logoff for user group settings to take effect;
   - [Disable the use of dnsmasq][docker_ubuntu_dns];
   - Stop dnsmasq and ensure it won't start at login:
@@ -65,7 +67,7 @@
     ```
 
 2. Add the Azuki keys to your local keychain:
-  
+
   ```bash
   $ sudo apt-key adv --keyserver keys.gnupg.net \
     --recv-keys 022856F6D78159DF43B487D5C82CF0628592D2C9
diff --git a/docs/content/en/installation/warning.md b/docs/content/en/installation/warning.md
@@ -1 +1 @@
-** Warning **: If you already have `azk` installed, prior to the `0.6.0` release, follow [these steps](upgrading.md#upgrading-from-azk--051) before moving forward. If you do not have `azk` installed ignore this warning and continue the installation normally.
+_Upgrade notice_: If you already have `azk` installed, prior to the `0.6.0` release, follow [these steps](upgrading.md#upgrading-from-azk--051) before moving forward. If you do not have `azk` installed ignore this warning and continue the installation normally.
diff --git a/docs/content/links.md b/docs/content/links.md
@@ -1,12 +1,14 @@
-[docker]: http://docker.io
+[docker]: http://docker.com
 [virtualbox_dl]: https://www.virtualbox.org/wiki/Downloads
 [homebrew_cask]: https://github.com/phinze/homebrew-cask
 [libnss-resolver]: https://github.com/azukiapp/libnss-resolver
 [docker_install]: https://docs.docker.com/installation/#installation
-[docker_ubuntu_14_04_maintained-package-installation]: https://docs.docker.com/installation/ubuntulinux/#docker-maintained-package-installation
-[docker_ubuntu-trusty-1404-lts-64-bit]: https://docs.docker.com/installation/ubuntulinux/#ubuntu-trusty-1404-lts-64-bit
-[docker_ubuntu_12_04]: https://docs.docker.com/installation/ubuntulinux/#ubuntu-precise-1204-lts-64-bit
+
+[docker_ubuntu_14_04_maintained-package-installation]: https://docs.docker.com/installation/ubuntulinux/#installation
+[docker_ubuntu-trusty-1404-lts-64-bit]: https://docs.docker.com/installation/ubuntulinux/#installation
+[docker_ubuntu_12_04]: https://docs.docker.com/installation/ubuntulinux/#installation
+
 [docker_ubuntu_dns]: https://docs.docker.com/installation/ubuntulinux/#configure-a-dns-server-for-use-by-docker
 [docker_root_access]: https://docs.docker.com/installation/ubuntulinux/#create-a-docker-group
 [postgres]: http://www.postgresql.org/
-[redis]: http://redis.io/
+[redis]: http://redis.io/
diff --git a/docs/content/pt-BR/installation/README.md b/docs/content/pt-BR/installation/README.md
@@ -6,9 +6,6 @@ A instalação vai adicionar o comando `azk` ao path do sistema. Isso torna o co
 
 - [Mac OS X](mac_os_x.md)
 - [Linux](linux.md)
-  - [Ubuntu Trusty](linux.html#ubuntu-trusty-1404-lts-64-bit)
-  - [Ubuntu Precise](linux.html#ubuntu-precise-1204-lts-64-bit)
-  - [Fedora](linux.html#fedora-20)
 - [Código fonte](source-code.md)
 - [Atualizando](upgrading.md)
 
diff --git a/docs/content/pt-BR/installation/linux.md b/docs/content/pt-BR/installation/linux.md
@@ -1,5 +1,7 @@
 # Linux
 
+> A forma mais simples de instalar o azk é seguindo a sessão [Instalação expressa do azk](./README.html#instalao-expressa-do-azk)
+
 !INCLUDE "warning.md"
 
 ## Requisitos
@@ -14,9 +16,9 @@
 
 1. Instale o Docker:
 
-  >Observe que pelas instruções de instalação do Docker no [site][docker_ubuntu-trusty-1404-lts-64-bit] deles, a primeira instrução de instalação é para um pacote mantido pela Ubuntu (_docker-io_) e não para a versão correta, mantida pelo Docker (_lxc-docker_).
+  >Observe que pelas instruções de instalação do Docker no [site][docker_ubuntu-trusty-1404-lts-64-bit] deles, a primeira instrução de instalação é para um pacote mantido pela Ubuntu (_docker.com_) e não para a versão correta, mantida pelo Docker (_docker-engine_).
 
-  - Instale a versão mais recente do Docker [**lxc-docker**][docker_ubuntu_14_04_maintained-package-installation]. Observe que no final das instruções, eles dispõem um `script curl` para facilitar a instalação.
+  - Instale a versão mais recente do Docker [**docker-engine**][docker_ubuntu_14_04_maintained-package-installation]. Observe que no final das instruções, eles dispõem um `script curl` para facilitar a instalação.
   - Inclua seu usuário local no [grupo docker][docker_root_access]; Faça um _logoff_ para que as configurações de grupo de usuários sejam ativadas;
   - [Desabilite o uso de dnsmasq][docker_ubuntu_dns];
   - Pare o serviço do dnsmasq e garanta que ele não será iniciado automaticamente após o login:
diff --git a/docs/content/pt-BR/installation/warning.md b/docs/content/pt-BR/installation/warning.md
@@ -1 +1 @@
-**Aviso**: Se você já tem o `azk` nas versões anteriores a `0.6.0` instalado, siga [estes passos](upgrading.md#atualizando-a-partir-azk--051) antes de continuar. Se você não tem o `azk` instalado ignore este aviso e continue a instalação normalmente.
+_Aviso sobre upgrade_: Se você já tem o `azk` nas versões anteriores a `0.6.0` instalado, siga [estes passos](upgrading.md#atualizando-a-partir-azk--051) antes de continuar. Se você não tem o `azk` instalado ignore este aviso e continue a instalação normalmente.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azk",
-  "version": "0.14.5",
+  "version": "0.14.6",
   "description": "Orchestrate development environments with agility and automation",
   "main": "index.js",
   "scripts": {
@@ -78,7 +78,7 @@
     "ssh2": "0.2.22",
     "syntax-error": "^1.1.0",
     "underscore": "^1.6.0",
-    "vboxmanage": "git+https://github.com/nuxlli/node-vboxmanage",
+    "vboxmanage": "git+https://github.com/azukiapp/node-vboxmanage",
     "which": "^1.0.5",
     "winston": "^0.7.3",
     "ws": "^0.7.1",
diff --git a/shared/scripts/install.sh b/shared/scripts/install.sh
@@ -176,17 +176,13 @@ check_docker_installation() {
   if hash docker 2>/dev/null; then
     step_done
     debug '  Docker is instaled, skipping docker installation.'
-    if [[ $ID == "ubuntu" ]]; then
-      debug '    To update docker, run command bellow:'
-      debug '    $ curl -sSL https://get.docker.com/ubuntu/ | sudo sh'
-    fi
+    debug '    To update docker, run command bellow:'
+    debug '    $ curl -sSL https://get.docker.com/ | sh'
   else
     step_fail
-    add_report 'azk needs docker to be installed.'
-    if [[ $ID == "ubuntu" ]]; then
-      add_report '  to install docker run command bellow:'
-      add_report '  $ curl -sSL https://get.docker.com/ubuntu/ | sudo sh'
-    fi
+    add_report 'azk needs Docker to be installed.'
+    add_report '  to install docker run command bellow:'
+    add_report '  $ curl -sSL https://get.docker.com/ | sh'
     fail
   fi
 }
diff --git a/spec/docker/pull_spec.js b/spec/docker/pull_spec.js
@@ -22,7 +22,7 @@ describe("Azk docker module, image pull @slow", function() {
       .then(() => {
         _subscription.unsubscribe();
 
-        var status = [
+        var status_list = [
           'pulling_repository',
           'pulling_layers',
           'pulling_metadata',
@@ -31,9 +31,10 @@ describe("Azk docker module, image pull @slow", function() {
           'download',
           'download_complete',
         ];
-        _.each(status, (status) => {
+
+        _.each(status_list, (status) => {
           h.expect(events)
-            .to.contain.an.item.with.deep.property('statusParsed.type', status);
+          .to.contain.an.item.with.deep.property('statusParsed.type', status);
         });
       })
       .catch(function (err) {
diff --git a/spec/docker/run_spec.js b/spec/docker/run_spec.js
@@ -1,6 +1,6 @@
 import { config, utils } from 'azk';
 import { subscribe } from 'azk/utils/postal';
-import { async, defer, delay } from 'azk/utils/promises';
+import { async, defer, delay, promiseResolve } from 'azk/utils/promises';
 import h from 'spec/spec_helper';
 
 var default_img = config('docker:image_default');
@@ -123,7 +123,13 @@ describe("Azk docker module, run method @slow", function() {
       yield h.docker.run(default_img, _cmd, { stdout: mocks.stdout });
       h.expect(outputs.stdout).to.match(/HTTP\/1\.1/);
 
-      return container.kill();
+      var container_info = yield container.inspect();
+      yield container.inspect();
+      if (container_info.State.Running) {
+        return container.kill();
+      } else {
+        return promiseResolve();
+      }
     });
   });
 
@@ -158,7 +164,13 @@ describe("Azk docker module, run method @slow", function() {
       var regex = new RegExp(h.escapeRegExp(`AZK_NAME=${data.Name.slice(1)}`), 'm');
       h.expect(log).to.match(regex);
 
-      return container.kill();
+      var container_info = yield container.inspect();
+      yield container.inspect();
+      if (container_info.State.Running) {
+        return container.kill();
+      } else {
+        return promiseResolve();
+      }
     });
   });
 
diff --git a/spec/generator/rules/generation/mysql_and_postgres_gen_spec.js b/spec/generator/rules/generation/mysql_and_postgres_gen_spec.js
@@ -165,15 +165,15 @@ describe('Azk generator db', function() {
           type: 'sync', value: `./${systemName}`, options: {}
         };
         expectedMounts[path.join('/azk', folderSystem, '.bundle')] = {
-          type: 'path', value: `${folderSystem}/.bundle`, options: {}
+          type: 'path', value: `./${systemName}/.bundle`, options: {}
         };
         expectedMounts[path.join('/azk', folderSystem, 'log')] = {
-          type: 'path', value: `${folderSystem}/log`, options: {}
+          type: 'path', value: `./${systemName}/log`, options: {}
         };
         expectedMounts[path.join('/azk', folderSystem, 'tmp')] = {
-          type: 'persistent', value: `${folderSystem}/tmp`, options: {}
+          type: 'persistent', value: `./${systemName}/tmp`, options: {}
         };
-        expectedMounts['/azk/bundler'] = { type: 'persistent', value: `${folderSystem}/bundler`, options: {} };
+        expectedMounts['/azk/bundler'] = { type: 'persistent', value: `./${systemName}/bundler`, options: {} };
 
         h.expect(system).to.have.deep.property('options.mounts').and.to.eql(expectedMounts);
       });
@@ -210,15 +210,15 @@ describe('Azk generator db', function() {
           type: 'sync', value: `./${systemName}`, options: {}
         };
         expectedMounts[path.join('/azk', folderSystem, '.bundle')] = {
-          type: 'path', value: `${folderSystem}/.bundle`, options: {}
+          type: 'path', value: `./${systemName}/.bundle`, options: {}
         };
         expectedMounts[path.join('/azk', folderSystem, 'log')] = {
-          type: 'path', value: `${folderSystem}/log`, options: {}
+          type: 'path', value: `./${systemName}/log`, options: {}
         };
         expectedMounts[path.join('/azk', folderSystem, 'tmp')] = {
-          type: 'persistent', value: `${folderSystem}/tmp`, options: {}
+          type: 'persistent', value: `./${systemName}/tmp`, options: {}
         };
-        expectedMounts['/azk/bundler'] = { type: 'persistent', value: `${folderSystem}/bundler`, options: {} };
+        expectedMounts['/azk/bundler'] = { type: 'persistent', value: `./${systemName}/bundler`, options: {} };
 
         h.expect(system).to.have.deep.property('options.mounts').and.to.eql(expectedMounts);
       });
diff --git a/spec/spec_helpers/dustman.js b/spec/spec_helpers/dustman.js
@@ -20,8 +20,14 @@ export function extend(Helpers) {
         publish("spec.dustman.remove_containers.message", t('test.remove_containers', containers.length));
         return thenAll(_.map(containers, (container) => {
           var c = h.docker.getContainer(container.Id);
-          return c.kill().then(() => {
-            return c.remove({ force: true });
+          return c.inspect().then(function(container_info) {
+            if (container_info.State.Running) {
+              return c.kill().then(() => {
+                return c.remove({ force: true });
+              });
+            } else {
+              return c.remove({ force: true });
+            }
           });
         }));
       });
diff --git a/src/agent/vm.js b/src/agent/vm.js
@@ -464,8 +464,9 @@ var vm = {
         // Remove networking interface
         if (!isBlank(info.hostonlyadapter1)) {
           var net    = yield hostonly.getByName(info.hostonlyadapter1);
-          var server = yield dhcp.getByNetworkName(net.VBoxNetworkName);
           if (!_.isEmpty(net)) {
+            var server = yield dhcp.getByNetworkName(net.VBoxNetworkName);
+
             if (!_.isEmpty(server)) {
               yield dhcp.remove_hostonly_server(info.hostonlyadapter1);
             }
diff --git a/src/config.js b/src/config.js
@@ -71,6 +71,7 @@ var options = mergeConfig({
       socket        : envs('AZK_DOCKER_SOCKER', "/var/run/docker.sock"),
       host          : new Dynamic("docker:host"),
       namespace     : envs('AZK_NAMESPACE'),
+      api_version   : envs('AZK_DOCKER_API_VERSION', 'v1.16'),
       repository    : 'azk',
       default_domain: 'azk',
       build_name    : 'azkbuild',
@@ -153,7 +154,7 @@ var options = mergeConfig({
       namespace   : 'azk.test',
       repository  : 'azk_test',
       build_name  : 'azkbuildtest',
-      image_empty : 'cevich/empty_base_image',
+      image_empty : 'cevich/empty_base_image:latest',
     },
     tracker: {
       disable: true,
diff --git a/src/docker/docker.js b/src/docker/docker.js
@@ -146,6 +146,7 @@ export class Docker extends promisifyClass('dockerode') {
   constructor(opts) {
     var info = opts.socketPath || `${opts.host}:${opts.port}`;
     log.info("Connecting to", info);
+    log.debug("[docker] connection options:", opts);
     super(opts);
 
     this.c_regex = RegExp(`\/${Utils.escapeRegExp(config('docker:namespace'))}`);
diff --git a/src/docker/index.js b/src/docker/index.js
@@ -1,4 +1,4 @@
-import { config } from 'azk';
+import { config, log } from 'azk';
 import { Docker, Image, Container } from 'azk/docker/docker';
 
 var url = require('url');
@@ -20,8 +20,10 @@ module.exports = {
           port : opts.port,
         };
       }
+      opts.version = config('docker:api_version');
       this.connect = new Docker(opts);
     }
+    log.debug("[docker] connect:", this.connect);
     return this.connect;
   },
 
diff --git a/src/docker/pull.js b/src/docker/pull.js
@@ -13,6 +13,7 @@ var msg_regex = {
   get pulling_layers     () { return new lazy.XRegExp('Pulling dependent layers'); },
   get pulling_metadata   () { return new lazy.XRegExp('Pulling metadata'); },
   get pulling_fs_layer   () { return new lazy.XRegExp('Pulling fs layer'); },
+  get pulling_up_to_date () { return new lazy.XRegExp('Image is up to date'); },
   get pulling_image      () { return new lazy.XRegExp(
     'Pulling image \((?<tag>.*)\) from (?<repository>.*), endpoint: (?<endpoint>.*)'
   ); },
diff --git a/src/generator/court.js b/src/generator/court.js
diff --git a/src/generator/suggestions/elixir.js b/src/generator/suggestions/elixir.js
diff --git a/src/generator/suggestions/elixir_phoenix.js b/src/generator/suggestions/elixir_phoenix.js
diff --git a/src/generator/suggestions/node.js b/src/generator/suggestions/node.js
diff --git a/src/generator/suggestions/php_composer.js b/src/generator/suggestions/php_composer.js
diff --git a/src/generator/suggestions/ruby.js b/src/generator/suggestions/ruby.js
diff --git a/src/libexec/package.sh b/src/libexec/package.sh
diff --git a/src/system/run.js b/src/system/run.js

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		- Warning : If you already have `azk` installed, prior to the `0.6.0` release, follow [these steps](upgrading.md#upgrading-from-azk--051) before moving forward. If you do not have `azk` installed ignore this warning and continue the installation normally.
	`1`	+_Upgrade notice_: If you already have `azk` installed, prior to the `0.6.0` release, follow [these steps](upgrading.md#upgrading-from-azk--051) before moving forward. If you do not have `azk` installed ignore this warning and continue the installation normally.
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-Aviso: Se você já tem o `azk` nas versões anteriores a `0.6.0` instalado, siga [estes passos](upgrading.md#atualizando-a-partir-azk--051) antes de continuar. Se você não tem o `azk` instalado ignore este aviso e continue a instalação normalmente.
	`1`	+_Aviso sobre upgrade_: Se você já tem o `azk` nas versões anteriores a `0.6.0` instalado, siga [estes passos](upgrading.md#atualizando-a-partir-azk--051) antes de continuar. Se você não tem o `azk` instalado ignore este aviso e continue a instalação normalmente.