Skip to content

Commit 825a0c6

Browse files
committed
refactor(seed-deis-registry): remove seed-deis-registry dependency
Currently, startup takes forever because registry blocks until the slugrunner container has been pulled. Users think things have stalled and/or are broken - this is a bad user experience. The ExecStartPost of the registry service already pulls the slugrunner image, so we don't need to block until this job occurs beforehand. Additionally, it's friendlier if the controller blocks until registry and logger are ready - if a user attempts to make an account, all of Deis should be up.
1 parent 1633cb8 commit 825a0c6

7 files changed

Lines changed: 7 additions & 17 deletions

File tree

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ uninstall: stop
2323
vagrant ssh -c 'cd share && for c in $(COMPONENTS); do cd $$c && sudo systemctl disable $$(pwd)/systemd/* && cd ..; done'
2424

2525
start:
26+
echo "\033[0;33mStarting services can take some time... grab some coffee!\033[0m"
2627
vagrant ssh -c 'cd share && for c in $(COMPONENTS); do cd $$c/systemd && sudo systemctl start * && cd ../..; done'
2728

2829
stop:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ make build
4747

4848
## Run Deis
4949

50-
Use `make run` to start all Deis containers and attach to their log output.
50+
Use `make run` to start all Deis containers and attach to their log output. This can take some time - the registry service will pull and prepare a Docker image. Grab some more coffee!
5151

5252
```
5353
make run

builder/systemd/deis-builder.service

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[Unit]
22
Description=deis-builder
3+
Requires=deis-registry.service
4+
After=deis-registry.service
35

46
[Service]
57
TimeoutStartSec=20m

contrib/coreos/user-data

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,5 @@ coreos:
6767
ExecStart=/usr/bin/systemctl stop update-engine-reboot-manager.service
6868
ExecStartPost=/usr/bin/systemctl mask update-engine-reboot-manager.service
6969

70-
[Install]
71-
WantedBy=multi-user.target
72-
- name: seed-docker-images.service
73-
command: start
74-
content: |
75-
[Unit]
76-
Description=Seed Docker images used by Deis
77-
Requires=docker.service
78-
79-
[Service]
80-
Type=oneshot
81-
ExecStart=/bin/sh -c 'docker pull deis/slugrunner:latest'
82-
8370
[Install]
8471
WantedBy=multi-user.target

contrib/vagrant/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ uninstall: stop
3131
for c in $(COMPONENTS); do fleetctl --strict-host-key-checking=false destroy ../../$$c/systemd/*; done
3232

3333
start:
34+
echo "\033[0;33mStarting services can take some time... grab some coffee!\033[0m"
3435
for c in $(COMPONENTS); do fleetctl --strict-host-key-checking=false start ../../$$c/systemd/*; done
3536

3637
stop:

controller/systemd/deis-controller.service

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[Unit]
22
Description=deis-controller
3-
Requires=deis-logger.service
3+
Requires=deis-logger.service deis-builder.service
4+
After=deis-logger.service deis-builder.service
45

56
[Service]
67
TimeoutStartSec=20m

registry/systemd/deis-registry.service

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[Unit]
22
Description=deis-registry
3-
Requires=seed-docker-images.service
4-
After=seed-docker-images.service
53

64
[Service]
75
TimeoutStartSec=20m

0 commit comments

Comments
 (0)