Merge branch 'release/0.15.0' into HEAD

Author: saitodisse

.dependencies

@@ -1,4 +1,6 @@
+DOCKER_MIN_VERSION=1.8.0
+DOCKER_API_VERSION=1.16
 LIBNSS_RESOLVER_VERSION=0.3.0
 RSYNC_MIN_VERSION=2.6.9
-AZK_ISO_VERSION=0.3.0
+AZK_ISO_VERSION=0.4.0
 BATS_VERSION=master

Azkfile.js

@@ -54,7 +54,7 @@ var agent_system = function(image, extras) {
       VERSION: "#{azk.version}",
     },
     docker_extra: {
-      start: { Privileged: true },
+      HostConfig: { Privileged: true },
     }
   }, extras);
 }
@@ -77,7 +77,7 @@ var test_package_system = function(image){
       LOG: "file", // Log docker to file
     },
     docker_extra: {
-      start: { Privileged: true },
+      HostConfig: { Privileged: true },
     }
   }
 }

CHANGELOG.md

@@ -5,6 +5,28 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## dev
 
+## v0.15.0 - (2015-09-15)
+
+* Bug
+  * [Manifest] Fixing wait not support `false` value;
+  * [Suggestions] Fixing `command` of php_composer suggestion;
+  * [Docker] Fixing support to comments and blank lines in `.dockerignore` file during Dockerfile build;
+
+* Enhancements
+  * [Cli] Start github URLs directly on `azk start` #476;
+  * [Package] `git` is an `azk` installation dependency #476;
+  * [Suggestions] Upgrading elixir_phoenix suggestion to work with Phoenix v1.0.0;
+  * [Docker] Checking Docker version (azk supports Docker v1.8+);
+  * [Docker] Upgrading to Docker 1.8.1 and locking to use Docker Remote API 1.20;
+  * [Docker] Refactoring `Docker.run` to use new Docker Remote API;
+  * [kernel] Separating development environment to be enabled with a single env var
+  * [VM] Changing the default VM memory amount to be 1/6 of the available in the host
+  * [Manifest] Adding `env` as a manifest system template;
+  * [Manifest] Improving how azk handles multiple `http.domains` set by env vars;
+
+* Deprecations
+  * [Manifest] `docker_extra.start` and `docker_extra.create` is no longer supported, now you must use the container creation options directly, check in: https://docs.docker.com/reference/api/docker_remote_api_v1.20/#create-a-container;
+
 ## v0.14.6 - (2015-08-20)
 
 * Bug
@@ -16,6 +38,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   * [Docker] Adding docker version lock;
   * [VM] Fixing removal of VM without net interface;
 
+* Enhancements
+  * [Scale] Adding flag `--no-remove` to start command;
+
 ## v0.14.5 - (2015-08-01)
 
 * Bug

README.md

@@ -69,6 +69,39 @@ $ azk start
 
 You can find our documentation online at: http://docs.azk.io/
 
+## `Run Project` button
+
+Clicking the `Run Project` button (or "azk button") on a GitHub repo is the best way to quickly and safely run its code on your local machine. 
+
+![Run project](https://s3-sa-east-1.amazonaws.com/assets.azk.io/azk-button.png)
+
+To add a `Run Project` button to a repo, you'll just need to add an Azkfile.js to the project and put the following badge in your README.md file (the following example is for a hypothetical repository with the URL `https://github.com/username/repo` and a branch called `azkfile` containing the Azkfile.js):
+
+```
+[![Run project](https://s3-sa-east-1.amazonaws.com/assets.azk.io/azk-button.png)](http://run-stage.azk.io/start/?repo=username/repo&ref=azkfile)
+```
+
+Check out the [`Run Project` Gallery][run_project_gallery] for examples of up to date forks of popular projects using it.
+
+## Deploying
+
+After you locally run a project using [`Run Project` button](#running-locally), deploying it to [DigitalOcean](http://digitalocean.com/) is very simple.
+
+First, put your [personal access token](https://cloud.digitalocean.com/settings/applications) into a `.env` file:
+
+```bash
+$ cd path/to/the/project
+$ echo "DEPLOY_API_TOKEN=<YOUR-PERSONAL-ACCESS-TOKEN>" >> .env
+```
+
+Then, just run the following:
+
+```bash
+$ azk shell deploy
+```
+
+Find further instructions on how to deploy to DigitalOcean using `azk` [here](https://github.com/azukiapp/docker-deploy-digitalocean/blob/master/README.md)
+
 ### Basic Vocabulary
 
 #### System of Systems
@@ -83,7 +116,7 @@ In order to automate the provisioning of development environments, `azk` uses pr
 
 `Azkfile.js` files are the cornerstone of how to use `azk`. These simple manifest files describe the systems that make your system of systems as well as the images used in their execution. They also describe parameters and execution options.
 
-More information [here](http://docs.azk.io/en/azkfilejs/README.html).
+More information [here][azkfile].
 
 ## Contributions
 
@@ -105,3 +138,5 @@ Check LEGAL and LICENSE files for more information.
 [docker_hub]: https://registry.hub.docker.com/
 [dockerfile]: http://dockerfile.github.io
 [docker_registry]: http://registry.hub.docker.com
+[azkfile]: http://docs.azk.io/en/azkfilejs/README.html
+[run_project_gallery]: https://github.com/azk-button/gallery

bin/azk

@@ -46,6 +46,8 @@ export PATH=$AZK_NPM_PATH/.bin:$PATH
 
 # Load dependencies versions
 . ${AZK_ROOT_PATH}/.dependencies
+export DOCKER_MIN_VERSION=${DOCKER_MIN_VERSION}
+export DOCKER_API_VERSION=${DOCKER_API_VERSION}
 export AZK_ISO_VERSION=${AZK_ISO_VERSION}
 export LIBNSS_RESOLVER_VERSION=${LIBNSS_RESOLVER_VERSION}
 export RSYNC_MIN_VERSION=${RSYNC_MIN_VERSION}

docs/Azkfile.js

@@ -18,6 +18,7 @@ systems({
     wait: {"retry": 20, "timeout": 2000},
     mounts: {
       '/azk/#{manifest.dir}': path("."),
+      '/azk/CONTRIBUTING.md': path("../CONTRIBUTING.md"),
       '/azk/node_modules': persistent("node_modules"),
     },
     scalable: {"default": 1},
@@ -26,6 +27,7 @@ systems({
       domains: [ "#{system.name}.#{azk.default_domain}" ]
     },
     ports: {
+      http:       "5000/tcp",
       livereload: "35729:35729/tcp",
     },
   },

docs/content/common/azkfilejs/full_example.md

@@ -5,7 +5,7 @@ systems({
     // Dependent systems
     depends: ["db"],
     // More images:  http://registry.hub.docker.com
-    image: { docker: "dockerfile/nodejs" },
+    image: { docker: "azukiapp/node" },
     // Steps to execute before running instances
     provision: [
       "npm install",
@@ -30,7 +30,7 @@ systems({
   },
 
   db: {
-    image: { docker: "tutum/mysql" },
+    image: { docker: "azukiapp/mysql" },
     mounts: {
       // Activates a persistent data folder in '/data'
       "/data": persistent("data-#{system.name}"),
@@ -50,5 +50,5 @@ systems({
 });
 
 // Sets a default system (to use: start, stop, status, scale)
-setDefault("node-example")
+setDefault("node-example");
 ```

docs/content/en/SUMMARY.md

@@ -48,6 +48,7 @@
      * [command](reference/azkfilejs/command.md)
      * [depends](reference/azkfilejs/depends.md)
      * [dns_servers](reference/azkfilejs/dns_servers.md)
+     * [docker_extra](reference/azkfilejs/docker_extra.md)
      * [envs](reference/azkfilejs/envs.md)
      * [export_envs](reference/azkfilejs/export_envs.md)
      * [extends](reference/azkfilejs/extends.md)

docs/content/en/agent/README.md

@@ -4,12 +4,12 @@ For `azk` to work correctly, it depends on the implementation of some services:
 
 * **Docker**: Container system responsible for image management and systems isolation;
 
-* **Máquina Virtual**: Since the `Docker` runtime is only supported on Linux machines, when used in Mac OS X `azk` makes use of a virtual machine (VirtualBox for the time being);
+* **Virtual Machine**: Since the `Docker` runtime is only supported on Linux machines, when used in Mac OS X `azk` makes use of a virtual machine (VirtualBox for the time being);
 
-* **Serviço de DNS**: Responsible for dns resolution for the domain `*.dev.azk.io`;
+* **DNS Service**: Responsible for dns resolution for the domain `*.dev.azk.io`;
 
-* **Balancer HTTP**: Responsible for load-balancing the calls to systems you orchestrate with `azk`;
+* **HTTP Balancer**: Responsible for load-balancing the calls to systems you orchestrate with `azk`;
 
 So you do not have to manage each of these services manually, `azk` has what we call the `azk agent`, a service that must always be running for you to use `azk`.
 
-To manage the _agent_ service we have the command `azk agent`. For a complete list of options [visit the agent page](../command-line/agent.md).
+To manage the _agent_ service we have the command `azk agent`. For a complete list of options [visit the agent page](../reference/cli/agent.md).

docs/content/en/installation/upgrading.md

@@ -11,6 +11,7 @@ Once `azk` has been installed via packages the upgrade process becomes really si
 
 ```bash
 $ azk agent stop
+$ brew update
 $ brew upgrade azukiapp/azk/azk
 ```