Commit Graph

68 Commits

Author SHA1 Message Date
5eb42b81b0 Rename start-resin-supervisor to start-balena-supervisor 2021-05-06 19:32:51 -04:00
09615c9d82 Change container name to balena_supervisor
Change-type: minor
Signed-off-by: Kyle Harding <kyle@balena.io>
2021-05-06 17:05:25 +00:00
5faf9d7686 Rename resin-supervisor to balena-supervisor
Change-type: minor
Signed-off-by: Kyle Harding <kyle@balena.io>
2021-05-06 17:05:25 +00:00
6ca9507beb balena-supervisor: replace references to resin-vars
Replace all references to the 'resin-vars' script with
'balena-config-vars' as it has been renamed. Add a conditional
test for compatibility with legacy systems.

Change-type: patch
Changelog-entry: balena-supervisor: replace references to resin-vars
Signed-off-by: Mark Corbin <mark@balena.io>
2021-04-20 09:58:04 +00:00
c317b02aef Fix dindctl script and update balenaos-in-container
Change-type: patch
Closes: #1306
Signed-off-by: Cameron Diver <cameron@balena.io>
2020-05-11 13:10:35 +01:00
913418bb37 Remove unnecessary config.json keys
Change-type: patch
2020-05-08 12:56:42 +01:00
8ab63656bd Update synchronisation scripts for supervisor development
We move the old sync.js script to tools/, and delete the now-broken
sync-debug.js.

We add a command `npm run sync`, which starts a livepush process
with the supervisor on a device.

Change-type: minor
Signed-off-by: Cameron Diver <cameron@balena.io>
2020-04-06 13:05:38 +01:00
a54b1ce048 📖 Update README with sync information
Signed-off-by: Cameron Diver <cameron@balena.io>
2020-04-06 10:50:00 +01:00
81966446d9 Update to balena-lint and enable javascript linting
Change-type: patch
2020-03-24 09:28:12 +00:00
4da1faced6 Update balenaos-in-container to pickup aufs2overlay changes
Change-type: patch
Signed-off-by: Cameron Diver <cameron@balena.io>
2020-02-10 23:34:09 +07:00
072a2f951a Update balenaos-in-container
Change-type: patch
2019-11-19 11:27:39 +00:00
a1ddf3682d Rebase start-resin-supervisor on latest meta-balena
Change-type: patch
2019-11-13 20:23:21 +00:00
05a566dcb5 Switch to balenaos-in-container
Change-type: patch
2019-11-12 13:50:05 +00:00
42c39ed36d dindctl: Allow mounting a backup.tgz to test migration backups
Change-type: patch
Signed-off-by: Pablo Carranza Velez <pablo@balena.io>
2018-12-12 14:17:34 -03:00
bba1da370b logger: Remove pubnub leftovers
Change-type: minor
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>
2018-07-18 12:31:10 -07:00
2f66e71d92 Use resinos-in-container for the development dind supervisor
Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2018-04-20 15:21:13 -07:00
2c92a4de02 dind: report a newer resinOS version to allow testing newer features
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2018-04-19 15:04:04 -07:00
056a5bc6c9 dind: Use Wants instead of Requires so that the supervisor doesn't exit when VPN is turned off
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2018-03-06 10:32:28 -08:00
65a287ea17 dind: Add a .gitkeep to docker.service.d to avoid dind build errors
This folder is used to add proxy configuration on build, and the dind build fails
if it doesn't exist.

Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-11-10 02:48:23 -08:00
e75c331aa3 Use balena 17.06 and resin-base v2.9.2 for the docker-in-docker supervisor
Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-11-03 09:57:28 -07:00
3771fd53ea Fix preloading and parsing of arguments in the dind supervisor
We now remove the quotes from the image name in the ExecStartPre of the supervisor dind service,
so that the images are properly pulled.

We also fix the parsing of arguments in dindctl so that it correctly parses all of the arguments (the last one was being missed if it didn't have a parameter).

Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-07-26 20:30:51 -03:00
8dfc559126 Move dindctl to the base of the repository
This makes it easier to use, as it's meant to be used constantly when developing. No need to change PATH
or type `./tools/dev/dindctl`, just run `./dindctl` now.

Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-07-20 21:22:25 -03:00
392d963348 Use a local supervisor image for the dind supervisor
We change the Makefile and dinctl so that instead of having to deploy and then pull a supervisor image, we save it from the local
docker images and load it inside the dind container.

We also fix dind so that it uses the dind hack script from the docker repo as official dind images do (this avoids breaking the
permissions of /dev/pts/ptmx in the host as in https://github.com/kubernetes/kubernetes/issues/18230).

Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-07-20 21:22:25 -03:00
da04b3065c Make dindctl an easier to use tool that takes options instead of using env vars
Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-07-20 21:22:25 -03:00
1dfa8b4448 Correct the DBUS_SYSTEM_BUS_ADDRESS variable to what godbus expects now
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-06-30 23:46:17 -07:00
0078c299b4 dind: Set DELTA_ENDPOINT, insert variant into os-release, and fix vpn apikeys
Setting DELTA_ENDPOINT as meta-resin does allows the dev dind supervisor to use the correct
delta server.

Inserting a VARIANT_ID into /etc/os-release allows treating this device as a dev build of Resin OS
(and avoids an unhandled exception).

Changing the precedence for device/provisioning apikeys in the vpn-init script allows the device
to connect to the VPN when a key exchange is still pending (as meta-resin does - though this is getting
replaced by watching config.json for changes).

This at least makes the development supervisor functional for now, but I'll work on improving the dind setup soon.

Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-06-30 22:59:02 -07:00
67b022e434 Add aufs-tools to the dind supervisor for use when running on aufs
Change-Type: patch
2017-04-27 23:43:46 -07:00
03ec97ab8d Change to the new device registration method to exchange our provisioning key with a dedicated api key for the device.
Change-Type: minor
2017-04-20 21:37:27 -07:00
58af4f7094 Switch to aufs for the docker-in-docker development supervisor
Also update a few details about the dind on the README.

Change-Type: patch
Signed-off-by: Pablo Carranza Velez <pablo@resin.io>
2017-01-06 15:45:41 -03:00
9e3612fb18 Mount the docker socket in the default path for dind 2016-10-26 09:12:28 -03:00
887a4714b8 Update dindctl logs to use journalctl now that we send logs there 2016-09-29 14:33:17 -07:00
bc8f0de95f dindctl: fix path for source with OE image 2016-09-26 18:17:12 +00:00
21003ba467 dind: add logs action, move all container management code into Makefile 2016-07-07 00:20:12 +03:00
1aca595eb2 dind: make supervisor image configurable 2016-07-06 11:47:25 +03:00
6aba97dce0 dind: bind-mount tool: deploy image to the correct registry 2016-07-06 02:18:30 +03:00
39af247233 dind: add helper scripts to speed-up development with bind mounts 2016-07-06 01:48:11 +03:00
aff199f42f dind: use --parse-arg to change dropbear config during build-time 2016-07-05 12:57:37 +03:00
324d187dc3 adding support to include internal CA Certs used by (an example) proxy servers 2016-06-28 12:46:27 -07:00
e45e7cf9b2 dind: add dropbear and prevent passwordless login by default 2016-06-25 15:04:23 +03:00
ab1ed3e681 dind: add docker 1.10.3 2016-06-25 15:04:23 +03:00
87be94f2d4 dind: add rsync 2016-06-25 15:04:23 +03:00
858e127ed0 dind: add DOCKER_ROOT env var 2016-06-25 15:04:23 +03:00
fc0a5ec85a Fix bash check for preloaded images, -eq is for integers. 2016-05-01 11:01:23 -07:00
42a960df47 Switch to using resin-base for the dind supervisor. 2016-04-29 09:50:08 -07:00
f910ec11a8 Remove even more old terminal related stuff. 2016-04-18 18:13:23 +01:00
b55a2c5539 Add resin-supervisor-host-socket.service for webterminal 2016-02-26 19:36:12 +02:00
6495b4f436 Use apps.json to determine the preloaded image to pull to dind 2015-10-13 13:45:09 -03:00
2ea336dec9 Don't duplicate 01_nodoc, and fix grammar in README 2015-10-13 13:45:08 -03:00
0a893aaa36 Make dind use debian instead of resin-base 2015-10-13 13:45:08 -03:00
fd012c35b4 Match resin-supervisor-dind dbus export to the one used on real devices 2015-10-13 13:45:08 -03:00