Skip to content

Commit 48cabd8

Browse files
committed
feat(*): allow custom component images
Pull image names for Deis components from etcd, defaulting to the stock Deis component images. This enables users to supply their own router, for instance, simply by setting an etcd key: /deis/{component}/image Also, the Deis release version is now stored in /etc/deis-release. This is by default appended when getting the image names for Deis components, but can be overridden if set in etcd at /deis/release.
1 parent 545bdb7 commit 48cabd8

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

systemd/deis-controller.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ After=deis-logger.service
66
[Service]
77
EnvironmentFile=/etc/environment
88
TimeoutStartSec=20m
9-
ExecStartPre=/bin/sh -c "docker history deis/controller >/dev/null || docker pull deis/controller:latest"
9+
ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
1010
ExecStartPre=/bin/sh -c "docker inspect deis-controller >/dev/null && docker rm -f deis-controller || true"
11-
ExecStart=/usr/bin/docker run --name deis-controller --rm -p 8000:8000 -e PUBLISH=8000 -e HOST=${COREOS_PRIVATE_IPV4} --volumes-from=deis-logger deis/controller
11+
ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/controller` && docker run --name deis-controller --rm -p 8000:8000 -e PUBLISH=8000 -e HOST=$COREOS_PRIVATE_IPV4 --volumes-from=deis-logger $IMAGE"
1212

1313
[Install]
1414
WantedBy=multi-user.target

0 commit comments

Comments
 (0)