Commit Graph

4978 Commits

Author SHA1 Message Date
b60123bdbf Merge pull request #780 from resin-io/logger-tests-longer-delay
test: Use longer delays in logger tests
2018-10-25 17:11:44 -07:00
1e47d0c434 test: Use longer delays in logger tests
We've seen at least one case where the 10ms delay
wasn't enough, causing the tests to fail where they shouldn't.

(Ideally we should find a better way to detect when the streams
have finished propagating, but this will avoid failures in the meantime).

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-25 16:48:06 -07:00
66b46cffd7 v7.25.9 v7.25.9 2018-10-25 23:45:42 +02:00
495bdf88b0 Merge pull request #779 from resin-io/docker-delta-2.2.2
Update docker-delta to v2.2.2
2018-10-25 14:43:01 -07:00
a205c3e72b Update docker-delta to v2.2.2
This fixes occasional timeouts in rsync after applying v2 deltas, which
cause unnecessary fallbacks to a regular pull.

This change also removes the need for the mkfifo native dependency (since
docker-delta 2.2.2 stops using it).

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-25 12:36:20 -07:00
e097a31348 v7.25.8 v7.25.8 2018-10-24 01:07:11 +02:00
2c5c9f72ee Merge pull request #778 from resin-io/moar-fixes
Two more bugfixes for next release
2018-10-23 16:05:02 -07:00
1c5891ec09 ApplicationManager: when comparing images to save metadata, take docker image ids into account
Otherwise we may skip saving a target image to the db when updating from legacy supervisors,
which in turn prevents from deleting the legacy image entry (with imageId = 1), leaving the
supervisor in a state where it can't report its current state to the API.

While we're at it, we also remove an unused variable in _getStatus.

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-23 15:43:59 -07:00
67486146c4 entry.sh: Use symbolic link to link to legacy lock path
The lack of `-s` was a typo.

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-23 15:43:59 -07:00
f96c35d07b v7.25.7 v7.25.7 2018-10-24 00:42:50 +02:00
bd9013fcb7 Merge pull request #776 from resin-io/circle-tags
circle.yml: Only push tagged images on tagged commits
2018-10-23 15:40:40 -07:00
db443e10b8 circle.yml: Only push tagged images on tagged commits
Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-23 15:15:49 -07:00
4eef50444a v7.25.6 v7.25.6 2018-10-23 20:32:21 +02:00
45dc26e344 Merge pull request #777 from resin-io/fix-local-detection
fix: Run checkTruthy on config values before using them
2018-10-23 20:29:41 +02:00
64de3d2f63 fix: Use fat arrow for cleanup method
Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
2018-10-23 19:13:34 +01:00
1879c76b00 fix: Run checkTruthy on config values before using them
Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
2018-10-23 18:32:38 +01:00
4b07d539c7 v7.25.5 v7.25.5 2018-10-22 22:59:54 +02:00
9996e20f17 Merge pull request #775 from resin-io/fix-apibinder-config-typo
fix: Properly get the config from target state before comparing durin…
2018-10-22 22:57:29 +02:00
f5b005bcb2 fix: Properly get the config from target state before comparing during initial config reporting
Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-22 13:18:53 -07:00
beae3e03c5 v7.25.4 v7.25.4 2018-10-22 12:29:33 +02:00
0bfb829fee Merge pull request #773 from resin-io/fix-config-bugs
Fix bugs with new config prefix and with updating from legacy containers
2018-10-22 12:26:56 +02:00
0eaae3d670 fix: When checking for legacy containers, properly get the labels from config
Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-20 19:08:53 +02:00
922597e582 fix: Avoid trying to report duplicated values in initial config
We do this by formatting the keys from the target state before comparing them
with the ones from the current state (that are already formatted to strip the namespace
prefix).

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-20 18:58:13 +02:00
6cd491c0c9 v7.25.3 v7.25.3 2018-10-20 04:52:24 +02:00
a42b2acde2 Merge pull request #772 from resin-io/fix-config-empty
Fix config.txt becoming empty after provision
2018-10-20 04:50:26 +02:00
b3860b2b70 fix: Store and retrieve device config without namespaces
This avoids issues on provisioning where the current state
(esp. config.txt) that we want to save is retrieved without
a RESIN_ or BALENA_ prefix, causing those values to be lost.

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-20 04:40:55 +02:00
cb31474d7a v7.25.2 v7.25.2 2018-10-19 18:04:15 +02:00
8a5a6ac519 Merge pull request #771 from resin-io/tty-true-default
Keep defaulting tty to true to avoid accidental breakage
2018-10-19 18:01:25 +02:00
32d5e58ead Keep defaulting tty to true to avoid accidental breakage
Otherwise old releases (where applications expected tty to be true)
would break.

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-19 17:54:13 +02:00
f89af2d508 v7.25.1 v7.25.1 2018-10-19 15:38:17 +02:00
b29a275e49 Merge pull request #768 from resin-io/preloading-when-no-target
Fix preloading in flasher images by reading apps.json if target hasn'…
2018-10-19 15:35:51 +02:00
6fb0147d3c Fix preloading in flasher images by reading apps.json if target hasn't been set
i.e. if we're not provisioned or if the target state is empty (of apps), then we
read apps.json to preload. We then mark that the target state has been set to avoid
trying to preload again if we ever get an empty target state from the API.

Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-19 14:42:29 +02:00
aee6a0db16 v7.25.0 v7.25.0 2018-10-18 17:47:08 +02:00
a762ba9dc0 Merge pull request #762 from resin-io/balena-config
deviceConfig: allow BALENA_ config variables
2018-10-18 17:45:14 +02:00
583ce34c01 apiBinder: Keep prepending RESIN_ to reported config variables
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-18 17:20:53 +02:00
24cbfbb860 deviceConfig: allow BALENA_ config variables
They will take precedence over any existing RESIN_ variables. We strip both namespaces now
whenever we get the target values.

This also fixes preloading with a legacy config (the interface to get the config keys from
the legacy apps.json was broken).

Change-type: minor
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-18 17:20:53 +02:00
658639ea65 v7.24.1 v7.24.1 2018-10-18 16:48:36 +02:00
8e0327662d Merge pull request #767 from resin-io/summit-fixes
Several small fixes
2018-10-18 15:46:15 +01:00
e04de0a170 fix: Add typescript cast to fix type error
Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
2018-10-18 15:14:12 +01:00
d939b2b9e6 fix: Remove debugging console logs
Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
2018-10-18 15:04:04 +01:00
6ad3a7981d fix: Redact environment variable values in debug output
Chnage-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
2018-10-18 15:04:04 +01:00
2a94a7b730 fix: Apply default config options when they're falsy
Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
2018-10-18 15:04:04 +01:00
5569e2bc84 fix: Always set the container name when generating creation options
Change-type: patch
Signed-off-by: Cameron Diver <cameron@resin.io>
2018-10-18 15:04:04 +01:00
96c1cea4ab v7.24.0 v7.24.0 2018-10-18 15:26:37 +02:00
d32561e9de Merge pull request #764 from resin-io/balena-os-changes
Changes to properly support balenaOS
2018-10-18 15:24:42 +02:00
e17bb59844 config: Allow atomic config.json writes on balenaOS
Change-type: minor
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-18 15:01:49 +02:00
0a4eefa9c6 network: Ignore resin-redsocks and balena-redsocks when reporting IP addresses
Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-18 15:01:49 +02:00
31e730600d Use the DOCKER_SOCKET env var for the user container's balena socket mount
Instead of hardcoding balena.sock we use this variable since the path changes
with the balena -> balenaEngine rename.

We keep also mounting into balena.sock for backwards compatibility (even though
most tools should transparently use the DOCKER_HOST env var).

Change-type: minor
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-10-18 15:01:49 +02:00
46535028c1 v7.23.0 v7.23.0 2018-10-18 14:58:53 +02:00
c5777855e2 Merge pull request #763 from resin-io/balena-labels
Replace io.resin labels (and their env vars) with io.balena equivalents
2018-10-18 14:56:40 +02:00