Commit Graph

15 Commits

Author SHA1 Message Date
Pablo Carranza Velez
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
Pablo Carranza Velez
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
Pablo Carranza Velez
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
Pablo Carranza Velez
9e3612fb18 Mount the docker socket in the default path for dind 2016-10-26 09:12:28 -03:00
Kostas Lekkas
39af247233 dind: add helper scripts to speed-up development with bind mounts 2016-07-06 01:48:11 +03:00
Kostas Lekkas
858e127ed0 dind: add DOCKER_ROOT env var 2016-06-25 15:04:23 +03:00
Pagan Gazzard
fc0a5ec85a Fix bash check for preloaded images, -eq is for integers. 2016-05-01 11:01:23 -07:00
Pablo Carranza Vélez
6495b4f436 Use apps.json to determine the preloaded image to pull to dind 2015-10-13 13:45:09 -03:00
Praneeth Bodduluri
fd012c35b4 Match resin-supervisor-dind dbus export to the one used on real devices 2015-10-13 13:45:08 -03:00
Praneeth Bodduluri
d6154b802d Adapt VPN service to mimic that of our devices + mount systemd in the supervisor 2015-10-13 13:45:07 -03:00
Pablo Carranza Vélez
0373607c56 Refactor bootstrapper. Run preloaded supervisor dind. Change dind configs to be ignored and document how to populate them. 2015-10-13 13:45:05 -03:00
Pagan Gazzard
7b02c067ac Use the endpoint settings from config.json 2015-10-13 13:45:01 -03:00
Pablo Carranza Vélez
53668647c8 Integration test is now working.
* More work on the integration test
* Correctly get supervisor IP
* Use Fatal for test errors
* test-integration working separate from run-supervisor
* Use jenkins' JOB_NAME to identify and remove containers with their volumes
* Document testing procedure
* Document the assume-unchanged tip
* Use /mnt/root for data path
* Nicer secret assignment
2015-10-13 13:43:36 -03:00
Praneeth Bodduluri
418d838dec Make resolv.conf writable from a User container 2015-10-13 13:43:35 -03:00
Pagan Gazzard
6c2467cca8 Allow running the supervisor in the devenv using docker in docker. 2015-10-13 13:42:23 -03:00