Skip to content

Commit 6ce0371

Browse files
committed
fix(seed-deis-registry): move into deis-registry.service
Since we moved seed-deis-registry from the user-data file in #770, the Makefile broke since we cannot perform many systemctl actions on a oneshot service. This moves it into an ExecStartPost after the deis-registry service starts. fixes #774
1 parent e130cff commit 6ce0371

2 files changed

Lines changed: 3 additions & 12 deletions

File tree

registry/systemd/deis-registry.service

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
[Unit]
22
Description=deis-registry
3+
Requires=seed-docker-images.service
4+
After=seed-docker-images.service
35

46
[Service]
57
TimeoutStartSec=20m
68
ExecStartPre=/bin/sh -c "/usr/bin/docker history deis/registry >/dev/null || /usr/bin/docker pull deis/registry"
79
ExecStartPre=/bin/bash -c "/usr/bin/docker start deis-registry-data || /usr/bin/docker run --name deis-registry-data -v /data deis/data"
810
ExecStart=/bin/sh -c "IFACE=$(netstat -nr | grep ^0.0.0.0 | awk '{print $8}') && HOST_IP=$(/bin/ifconfig $IFACE | awk '/inet /{print $2}') && exec /usr/bin/docker run --name deis-registry -p 5000:5000 -e PUBLISH=5000 -e HOST=$HOST_IP --volumes-from deis-registry-data deis/registry"
9-
ExecStartPost=/bin/sh -c "IFACE=$(netstat -nr | grep ^0.0.0.0 | awk '{print $8}') && HOST_IP=$(/bin/ifconfig $IFACE | awk '/inet /{print $2}') && echo "Waiting for listener on 5000/tcp..." && until cat </dev/null>/dev/tcp/$HOST_IP/5000; do sleep 1; done"
11+
ExecStartPost=/bin/sh -c "IFACE=$(netstat -nr | grep ^0.0.0.0 | awk '{print $8}') && HOST_IP=$(/bin/ifconfig $IFACE | awk '/inet /{print $2}') && echo 'Waiting for listener on 5000/tcp...' && until cat </dev/null>/dev/tcp/$HOST_IP/5000; do sleep 1; done && docker pull deis/slugrunner:latest && docker tag deis/slugrunner $HOST_IP:5000/deis/slugrunner && docker push $HOST_IP:5000/deis/slugrunner"
1012
ExecStop=/usr/bin/docker rm -f deis-registry
1113

1214
[Install]

registry/systemd/seed-deis-registry.service

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)