perf: slim down Docker image

Running the avahi-daemon within Docker can cause conflicts and problems, plus it is a very heavyweight approach. Instead, we can just mount the host DBUS and use the host Avahi interface properly.
mKeRix · Feb 20, 2020 · 0fc6d84 · 0fc6d84
1 parent 67593d4
commit 0fc6d84
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 40 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,2 @@
 *
-!docker/
 !/*.tgz
diff --git a/Dockerfile b/Dockerfile
@@ -8,15 +8,11 @@ FROM node:12-alpine
 
 WORKDIR /room-assistant
 
-RUN apk add --no-cache supervisor bluez bluez-deprecated libusb avahi avahi-dev dmidecode \
-    && mkdir -p /var/run/dbus \
+RUN apk add --no-cache bluez bluez-deprecated libusb avahi-dev dmidecode \
     && setcap cap_net_raw+eip $(eval readlink -f `which node`) \
     && setcap cap_net_raw+eip $(eval readlink -f `which hcitool`) \
-    && addgroup --gid 998 i2c \
-    && addgroup node i2c \
     && ln -s /usr/local/lib/node_modules/room-assistant/bin/room-assistant.js /usr/local/bin/room-assistant
-COPY docker/supervisord.conf docker/entrypoint.sh /etc/
 COPY --from=build /usr/local/lib/node_modules/room-assistant /usr/local/lib/node_modules/room-assistant
 
-ENTRYPOINT ["/bin/sh", "-c"]
-CMD ["/etc/entrypoint.sh"]
+ENTRYPOINT ["room-assistant"]
+CMD ["--digResolver"]
diff --git a/dev.Dockerfile b/dev.Dockerfile
@@ -9,15 +9,11 @@ FROM node:12-alpine
 
 WORKDIR /room-assistant
 
-RUN apk add --no-cache supervisor bluez bluez-deprecated libusb avahi avahi-dev dmidecode \
-    && mkdir -p /var/run/dbus \
+RUN apk add --no-cache bluez bluez-deprecated libusb avahi-dev bind-tools dmidecode \
     && setcap cap_net_raw+eip $(eval readlink -f `which node`) \
     && setcap cap_net_raw+eip $(eval readlink -f `which hcitool`) \
-    && addgroup --gid 998 i2c \
-    && addgroup node i2c \
     && ln -s /usr/local/lib/node_modules/room-assistant/bin/room-assistant.js /usr/local/bin/room-assistant
-COPY docker/supervisord.conf docker/entrypoint.sh /etc/
 COPY --from=build /usr/local/lib/node_modules/room-assistant /usr/local/lib/node_modules/room-assistant
 
-ENTRYPOINT ["/bin/sh", "-c"]
-CMD ["/etc/entrypoint.sh"]
+ENTRYPOINT ["room-assistant"]
+CMD ["--digResolver"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
diff --git a/docker/supervisord.conf b/docker/supervisord.conf
diff --git a/docs/guide/configuration.md b/docs/guide/configuration.md
@@ -18,6 +18,8 @@ services:
   room-assistant:
     image: mkerix/room-assistant
     network_mode: host
+    volumes:
+      - /var/run/dbus:/var/run/dbus
     environment:
       NODE_CONFIG: >
         {