@@ -1 +1,2 @@
 config.json
+.DS_Store
@@ -17,11 +17,6 @@ RUN wget --no-check-certificate -O - https://deb.nodesource.com/setup_6.x | bash
 # install homebridge
 RUN npm install -g --unsafe-perm homebridge hap-nodejs node-gyp
 
-# install homebridge plugins
-RUN npm install -g homebridge-nest --unsafe-perm
-RUN npm install -g https://github.com/rcreasey/homebridge-garage-sentry.git --unsafe-perm
-RUN npm install -g homebridge-platform-ring-video-doorbell
-
 USER root
 VOLUME ["/root/.homebridge"]
 RUN mkdir -p /var/run/dbus
 
@@ -0,0 +1,5 @@
+FROM rcreasey/rpi-homebridge:base
+
+RUN npm install -g https://github.com/rcreasey/homebridge-garage-sentry.git --unsafe-perm
+RUN npm install -g homebridge-nest --unsafe-perm
+# RUN npm install -g homebridge-platform-ring-video-doorbell
@@ -0,0 +1,14 @@
+[Unit]
+Description=Homebridge
+Requires=docker.service
+After=docker.service
+
+[Service]
+Restart=always
+ExecStartPre=-/usr/bin/docker stop %n
+ExecStartPre=-/usr/bin/docker rm %n
+ExecStart=/usr/bin/docker run -p 0.0.0.0:51826:51826 -v /opt/homebridge:/root/.homebridge --name %n --net=host rcreasey/rpi-homebridge
+ExecStop=/usr/bin/docker stop -t 2 %n
+
+[Install]
+WantedBy=default.target