Skip to content
This repository was archived by the owner on Apr 9, 2020. It is now read-only.

Commit 30c6df6

Browse files
committed
Merge branch 'release/0.19.0' into stable
2 parents 109e8ac + 6c0fd2e commit 30c6df6

File tree

97 files changed

+2411
-2168
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+2411
-2168
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,15 @@ We strongly recommend you to write your message in English for 2 main reasons:
2727
4. Further info
2828

2929
a. Which OS / distro?
30-
b. Uses VirtualBox? Which version?
30+
b. Which VirtualBox version? (If running Mac OS X)
3131
c. Can you provide us your Azkfile.js?
3232

33+
```js
34+
systems({
35+
'my-app': {}
36+
});
37+
```
38+
3339
**ProTip**: run `azk version --full` to gather those info.
3440

3541
5. Do you have any suggestions on how to tackle this?

Azkfile.js

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,39 @@
33
*/
44

55
var mounts = {
6-
"/azk/#{manifest.dir}" : sync('./', { shell: true }),
6+
"/azk/#{manifest.dir}" : sync('./', { shell: true }),
7+
"/azk/#{manifest.dir}/docs" : path("./docs"),
78
"/azk/#{manifest.dir}/package" : path("./package"),
8-
"/azk/#{manifest.dir}/docs" : path("./docs"),
99
"/azk/#{manifest.dir}/node_modules" : persistent('node_modules-#{system.name}'),
10-
"/azk/#{manifest.dir}/.package-envs" : path("./.package-envs"),
11-
"/azk/demos" : path("../demos"),
12-
"/azk/build" : persistent('build-#{system.name}'),
13-
"/azk/lib" : persistent('lib-#{system.name}'),
14-
"/azk/data" : persistent('data-#{system.name}'),
15-
"/azk/aptly" : persistent('aptly-#{system.name}'),
16-
"/var/lib/docker" : persistent('docker_files-#{system.name}'),
17-
"/root/.npm" : persistent('npm-cache'),
18-
"/usr/local/bin/make" : path("./src/libexec/make"),
19-
"/root/.aptly.conf" : path("./src/libexec/aptly.json"),
20-
"/.tmux.conf" : path(env.HOME + "/.tmux.conf"),
10+
"/azk/#{manifest.dir}/.package-envs": path("./.package-envs"),
11+
"/azk/demos" : path("../demos"),
12+
"/azk/build" : persistent('build-#{system.name}'),
13+
"/azk/lib" : persistent('lib-#{system.name}'),
14+
"/azk/data" : persistent('data-#{system.name}'),
15+
"/azk/aptly" : persistent('aptly-#{system.name}'),
16+
"/var/lib/docker" : persistent('docker_files-#{system.name}'),
17+
"/root/.npm" : persistent('npm-cache'),
18+
"/usr/local/bin/make": path("./src/libexec/make"), // Force `make -e`
19+
"/root/.aptly.conf" : path("./src/libexec/aptly.json"),
20+
"/.tmux.conf" : path(env.HOME + "/.tmux.conf"),
2121
};
2222

2323
var envs = {
24-
PATH: "/azk/#{manifest.dir}/bin:/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
24+
VERSION: "#{azk.version}",
25+
PATH : "/azk/#{manifest.dir}/bin:/usr/local/bundle/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
2526
AZK_ENV : "development",
2627
AZK_DATA_PATH: "/azk/data",
2728
AZK_LIB_PATH : "/azk/lib",
2829
AZK_NAMESPACE: "azk.linux",
2930
AZK_PACKAGE_PATH: "/azk/build",
31+
32+
// dind options
33+
LOG : "file",
34+
EXTRA_SCRIPT : "/azk/#{manifest.dir}/src/libexec/init_azk",
35+
36+
// Balancer configuration to not conflict
3037
AZK_BALANCER_HOST: "linux.azk.io",
3138
AZK_BALANCER_PORT: 8080,
32-
LOG: "file",
33-
EXTRA_SCRIPT: "/azk/#{manifest.dir}/src/libexec/init_azk",
34-
VERSION: "#{azk.version}",
3539
};
3640

3741
systems({
@@ -73,6 +77,11 @@ systems({
7377
image: { docker: 'azukiapp/dind:ubuntu15' },
7478
},
7579

80+
'dind-ubuntu16': {
81+
extends: "dind-ubuntu12",
82+
image: { docker: 'azukiapp/dind:ubuntu16' },
83+
},
84+
7685
'dind-fedora': {
7786
extends: "dind-ubuntu12",
7887
image: { docker: 'azukiapp/dind:fedora20' },
@@ -109,6 +118,11 @@ systems({
109118
image: { docker: 'azukiapp/dind:ubuntu15' },
110119
},
111120

121+
'pkg-ubuntu16-test': {
122+
extends: "pkg-ubuntu12-test",
123+
image: { docker: 'azukiapp/dind:ubuntu16' },
124+
},
125+
112126
'pkg-fedora20-test': {
113127
extends: "pkg-ubuntu12-test",
114128
image: { docker: 'azukiapp/dind:fedora20' },

CHANGELOG.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,32 @@
33
All notable changes to this project will be documented in this file.
44
This project adheres to [Semantic Versioning](http://semver.org/).
55

6+
## v0.19.0 - (2016-09-28)
7+
8+
* Bug
9+
* [Core] Simplification the images downloads process;
10+
* [Core] Fixing regex bug in expand envs (not expand numbers: `$1` or `${2}`);
11+
* [Core] Adding image envs in expand envs variable process;
12+
* [Core] Adding support to escape variables in command options (shell and system);
13+
* [Cli] Fixing error thrown when 'azk scale' command was run, regardless it was successful or not;
14+
* [Cli] Fixing escape character in `azk vm ssh`;
15+
* [Sync] Fixing bug when the path to be synced contained whitespace (#672);
16+
* [Sync] Removing `system.name` from the destination sync path, which avoids multiple syncs for extended systems;
17+
* [Systems] Fixing load envs from file with `=` in value;
18+
19+
* Enhancements
20+
* [Suggestions] Refactoring court to support more suggestion for one evidence;
21+
* [Suggestions] Adding support wordpress;
22+
* [Core] Support images of other repositories beyond Docker Hub;
23+
* [Sync] Adding support special characters in sync paths;
24+
* [Sync] Updating `chokidar` lib (file watching), for a better performance and bug fixes;
25+
* [Sync] Refactoring the sync system to sync the file tree from the modified file, not the whole tree;
26+
* [Sync] Improving support to `.gitignore` file, ensuring all the paths listed in it are properly resolved;
27+
* [Sync] Improving fault tolerance for the sync process;
28+
* [Sync] Removing a synced folder shouldn't break the agent nor the sync process;
29+
* [Package] Adding `ubuntu 16.04` support;
30+
* [Balancer] Support for tweaking Load Balancer settings via environment (`AZK_BALANCER_{WORKERS,WORKER_MAX_SOCKETS,TCP_TIMEOUT,DEAD_BACKEND_TTL}`);
31+
632
## v0.18.0 - (2016-04-07)
733

834
* Enhancements

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ PACKAGE_NPM_VERSION_FILE := ${PATH_AZK_NVM}/npm_versions
136136

137137
package_check_node_dependencies: ${NODE_PACKAGE}
138138
@if [ ! "$$(${AZK_BIN} nvm npm --version)" = "${NPM_VERSION}" ] ; then \
139-
rm ${PACKAGE_NPM_VERSION_FILE}; \
139+
rm -f ${PACKAGE_NPM_VERSION_FILE}; \
140140
fi
141141

142142
# Build package folders tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ More information [here][azkfile].
120120

121121
## Contributions
122122

123-
Check our [Contributing Guide](CONTRIBUTING.md) for instructions on how to help the project!
123+
Check our [Contributing Guide](.github/CONTRIBUTING.md) for instructions on how to help the project!
124124

125125
Share the love and star us here in Github!
126126

docs/content/en/installation/linux.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Requirements
66

7-
* **Distributions (tested)**: Ubuntu 12.04/14.04/15.10, Fedora 20/21/22 and Arch Linux
7+
* **Distributions (tested)**: Ubuntu 12.04/14.04/15.10/16.04, Fedora 20/21/22 and Arch Linux
88
* **Architecture**: 64-bits
99
* [Docker][docker] 1.8.1 or later
1010
* Not running any services on ports `80` and `53`
@@ -109,6 +109,10 @@ The easiest way to install `azk` is to use the script below. It will identify yo
109109
# Ubuntu Wily (15.10)
110110
$ echo "deb [arch=amd64] http://repo.azukiapp.com wily main" | \
111111
sudo tee /etc/apt/sources.list.d/azuki.list
112+
113+
# Ubuntu Xenial Xerus (16.04)
114+
$ echo "deb [arch=amd64] http://repo.azukiapp.com xenial main" | \
115+
sudo tee /etc/apt/sources.list.d/azuki.list
112116
```
113117

114118
3. Update the list of packages and install azk:

docs/content/en/reference/cli/restart.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
## azk restart
22

3-
Stops either all instances of the systems in the current `Azkfile.js` or the one specified and starts them back again. If an error occurs during reboot, all systems will be stopped.
3+
Restart works by memorizing the current status of the systems in the current `Azkfile`, stops them and then get them back online again.
4+
5+
If a `[system]` is specified with the command, `azk` will just restart the specified system.
6+
7+
To restart a system and its dependencies is necessary to pass a list of systems to be restarted: `azk restart system_dependency,system_top`.
8+
9+
If an error occurs during the reboot, all systems will be stopped.
410

511
#### Usage:
612

docs/content/en/reference/cli/scale.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## azk scale
22

3-
Scales (up or down) one or more systems.
3+
Scales the default or a specified system to a total amount of instances.
44

55
#### Usage:
66

@@ -10,7 +10,7 @@
1010

1111
```
1212
system System name where the action will take place.
13-
to Number of available instances after scaling.
13+
to New total amount of instances.
1414
```
1515

1616
#### Options:

docs/content/en/reference/cli/shell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## azk shell
22

3-
Initializes a shell with the instance context, or executes an arbitrary command.
3+
Initializes a new shell instance with the application context, or executes an arbitrary command if provided.
44

55
#### Usage:
66

docs/content/pt-BR/installation/linux.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## Requisitos
66

7-
* **Distribuições (testadas)**: Ubuntu 12.04/14.04/15.10, Fedora 20/21/22 e Arch Linux
7+
* **Distribuições (testadas)**: Ubuntu 12.04/14.04/15.10/16.04, Fedora 20/21/22 e Arch Linux
88
* **Arquitetura**: 64-bits
99
* [Docker][docker] 1.8.1 ou mais recente
1010
* Não estar rodando nenhum serviço nas portas `80` e `53`
@@ -109,6 +109,10 @@ A forma mais fácil de instalar o `azk` é utilizar o script abaixo. Ele vai ide
109109
# Ubuntu Wily (15.10)
110110
$ echo "deb [arch=amd64] http://repo.azukiapp.com wily main" | \
111111
sudo tee /etc/apt/sources.list.d/azuki.list
112+
113+
# Ubuntu Xenial Xerus (16.04)
114+
$ echo "deb [arch=amd64] http://repo.azukiapp.com xenial main" | \
115+
sudo tee /etc/apt/sources.list.d/azuki.list
112116
```
113117

114118
3. Atualize a lista de pacotes e instale o azk:

0 commit comments

Comments
 (0)