Skip to content

Commit ceb90dc

Browse files
committed
bug(units): fix demo units
1 parent 4f645da commit ceb90dc

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

v1/units/deis-monitor-alertmanager.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Description=deis-monitor-alertmanager
44
[Service]
55
EnvironmentFile=/etc/environment
66
TimeoutStartSec=20m
7-
ExecStartPre=/bin/sh -c "IMAGE=`deis/monitor-alertmanager:latest` && docker history $IMAGE >/dev/null 2>&1 || flock -w 1200 /var/run/lock/monitor-alertmanager docker pull $IMAGE" # fixme: IMAGE handling
7+
ExecStartPre=/bin/sh -c "IMAGE=`quay.io/deis/monitor-alertmanager:latest` && docker history $IMAGE >/dev/null 2>&1 || flock -w 1200 /var/run/lock/monitor-alertmanager docker pull $IMAGE" # fixme: IMAGE handling
88
ExecStartPre=/bin/sh -c "docker inspect deis-monitor-alertmanager >/dev/null 2>&1 && docker rm -f deis-monitor-alertmanager >/dev/null 2>&1 || true"
9-
ExecStart=/bin/sh -c "IMAGE=deis/monitor-daemon:latest && docker run --name deis-monitor-alertmanager --rm -e HOST=$COREOS_PRIVATE_IPV4 -p 9093:9093 $IMAGE"
9+
ExecStart=/bin/sh -c "IMAGE=quay.io/deis/monitor-alertmanager:latest && docker run --name deis-monitor-alertmanager --rm -e HOST=$COREOS_PRIVATE_IPV4 -p 9093:9093 $IMAGE"
1010
ExecStartPost=/bin/sh -c "etcdctl set /deis/monitor/alertManagerUri http://$COREOS_PRIVATE_IPV4:9093 >/dev/null" # <- fixme hax
1111
ExecStop=-/usr/bin/docker stop deis-monitor-alertmanager
1212
Restart=on-failure

v1/units/deis-monitor-daemon.service

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ Description=deis-monitor-daemon
44
[Service]
55
EnvironmentFile=/etc/environment
66
TimeoutStartSec=20m
7-
ExecStartPre=/bin/sh -c "IMAGE=deis/monitor-daemon:latest && docker history $IMAGE >/dev/null 2>&1 || flock -w 1200 /var/run/lock/monitor-daemon docker pull $IMAGE" # fixme: IMAGE handling
7+
ExecStartPre=/bin/sh -c "IMAGE=quay.io/deis/monitor-daemon:latest && docker history $IMAGE >/dev/null 2>&1 || flock -w 1200 /var/run/lock/monitor-daemon docker pull $IMAGE" # fixme: IMAGE handling
88
ExecStartPre=/bin/sh -c "docker inspect deis-monitor-daemon >/dev/null 2>&1 && docker rm -f deis-monitor-daemon >/dev/null 2>&1 || true"
9-
ExecStart=/bin/sh -c "IMAGE=deis/monitor-daemon:latest && docker run --name deis-monitor-daemon --rm -e HOST=$COREOS_PRIVATE_IPV4 -p 9090:9090 $IMAGE" # fixme, port shouldnt be exposed for all to see.
9+
ExecStart=/bin/sh -c "IMAGE=quay.io/deis/monitor-daemon:latest && docker run --name deis-monitor-daemon --rm -e HOST=$COREOS_PRIVATE_IPV4 -p 9099:9090 $IMAGE" # fixme, port shouldnt be exposed for all to see.
1010
ExecStop=-/usr/bin/docker stop deis-monitor-daemon
1111
Restart=on-failure
1212
RestartSec=5

0 commit comments

Comments
 (0)