Migrate to S6-Overlay (#98)

* Migrate to S6-Overlay

* Migrate builder generic

* Update base/rootfs/etc/cont-init.d/udev.sh

Co-Authored-By: Franck Nijhof <[email protected]>

* Update landingpage/rootfs/etc/services.d/nginx/run

Co-Authored-By: Franck Nijhof <[email protected]>

* Fix validate

Co-authored-by: Franck Nijhof <[email protected]>

Author: pvizeli

azure-pipelines.yml

@@ -14,14 +14,12 @@ pr:
 - master
 
 variables:
-  - name: basePythonTag
-    value: '3.7-alpine3.10'
   - name: versionHadolint
     value: 'v1.17.2'
   - name: versionShellCheck
     value: 'v0.7.0'
   - name: versionBuilder
-    value: '6.9'
+    value: '7.1'
   - group: docker
 
 jobs:
@@ -54,7 +52,7 @@ jobs:
   - script: |
       shopt -s globstar
       sudo docker run --rm -i \
-        -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) **/*.sh
+        -v $(pwd):/mnt:ro koalaman/shellcheck:$(versionShellCheck) -s bash **/{*.sh,run,finish}
     displayName: 'Run ShellCheck'
 
 
@@ -89,6 +87,5 @@ jobs:
         -v ~/.docker:/root/.docker \
         -v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
         homeassistant/amd64-builder:$(versionBuilder) \
-        --homeassistant-base $(Build.SourceBranchName)=$(basePythonTag) \
-        "--$(buildArch)" -t /data/base --docker-hub homeassistant
+        --generic $(Build.SourceBranchName) "--$(buildArch)" -t /data/base
     displayName: 'Build Home Assistant Base'

base/Dockerfile

@@ -54,10 +54,6 @@ RUN apk add --no-cache \
     unixodbc \
     zlib
 
-###
-# Create /etc/odbcinst.ini for FreeTDS ODBC driver
-COPY odbcinst.ini /etc/
-
 ####
 ## Install pip module for component/homeassistant
 COPY requirements.txt /usr/src/
@@ -125,7 +121,5 @@ RUN apk add --no-cache \
     && rm -rf /usr/src/telldus
 
 ###
-# Setup entry point for udevd
-COPY entry.sh /bin/
-
-ENTRYPOINT ["/bin/entry.sh"]
+# Base S6-Overlay
+COPY rootfs /

base/build.json

@@ -0,0 +1,13 @@
+{
+  "image": "homeassistant/{arch}-homeassistant-base",
+  "build_from": {
+    "aarch64": "homeassistant/aarch64-base-python:3.7-alpine3.10",
+    "armhf": "homeassistant/armhf-base-python:3.7-alpine3.10",
+    "armv7": "homeassistant/armv7-base-python:3.7-alpine3.10",
+    "amd64": "homeassistant/amd64-base-python:3.7-alpine3.10",
+    "i386": "homeassistant/i386-base-python:3.7-alpine3.10"
+  },
+  "labels": {
+    "io.hass.type": "homeassistant-base"
+  }
+}

base/entry.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Start udev service
+# ==============================================================================
+udevd --daemon
+
+bashio::log.info "Update udev information"
+udevadm trigger
+udevadm settle

base/rootfs/etc/cont-init.d/udev.sh

@@ -11,6 +11,7 @@ RUN pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${W
         -e ./homeassistant \
     && python3 -m compileall homeassistant/homeassistant
 
-# Run Home Assistant
+# Home Assistant S6-Overlay
+COPY rootfs /
+
 WORKDIR /config
-CMD [ "python3", "-m", "homeassistant", "--config", "/config" ]

base/odbcinst.ini renamed to base/rootfs/etc/odbcinst.ini

@@ -0,0 +1,5 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Take down the S6 supervision tree when Home Assistant fails
+# ==============================================================================
+s6-svscanctl -t /var/run/s6/services

generic/Dockerfile

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Start Home Assistant service
+# ==============================================================================
+exec python3 -m homeassistant --config /config

generic/rootfs/etc/services.d/home-assistant/finish

@@ -5,8 +5,4 @@ FROM $BUILD_FROM
 RUN apk --no-cache add nginx
 
 # Copy data
-COPY www/ /usr/share/www/
-COPY data/nginx.conf /etc/nginx/
-COPY data/run.sh /
-
-CMD ["/run.sh"]
+COPY rootfs /

generic/rootfs/etc/services.d/home-assistant/run

@@ -0,0 +1,5 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Take down the S6 supervision tree when Nginx fails
+# ==============================================================================
+s6-svscanctl -t /var/run/s6/services

landingpage/Dockerfile

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Start Nginx service
+# ==============================================================================
+exec nginx