diff --git a/example/Dockerfile b/example/Dockerfile index 9107376..2104a08 100644 --- a/example/Dockerfile +++ b/example/Dockerfile @@ -1,6 +1,9 @@ -# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile -ARG BUILD_FROM -FROM $BUILD_FROM +ARG BUILD_FROM=ghcr.io/hassio-addons/base:16.3.6 +# hadolint ignore=DL3006 +FROM ${BUILD_FROM} + +# Copy root filesystem +COPY rootfs / # https://www.virtualhere.com/sites/default/files/usbclient/vhclient${BUILD_ARCH} RUN \ @@ -8,11 +11,31 @@ RUN \ "https://www.virtualhere.com/sites/default/files/usbclient/vhclientx86_64" RUN chmod a+x /usr/bin/vhclient -# Execute during the build of the image -#ARG TEMPIO_VERSION BUILD_ARCH -#RUN \ -# curl -sSLf -o /usr/bin/tempio \ -# "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" +# Build arguments +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION -# Copy root filesystem -COPY rootfs / +# Labels +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="Hans Karlinius " \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Community Add-ons" \ + org.opencontainers.image.authors="Hans Karlinius " \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://addons.community" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION} \ No newline at end of file diff --git a/example/config.yaml b/example/config.yaml index e345574..66904d3 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -1,6 +1,6 @@ # https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config name: Example add-on -version: "1.2.8" +version: "1.2.9" slug: example description: Example add-on url: "https://github.com/home-assistant/addons-example/tree/main/example" @@ -26,10 +26,8 @@ privileged: - SYS_TIME - SYS_NICE #devicetree: true -host_dbus: true usb: true usbip: true -udev: true map: - share:rw options: diff --git a/example/rootfs/etc/cont-init.d/load_modules.sh b/example/rootfs/etc/cont-init.d/load_modules.sh new file mode 100644 index 0000000..9c64fbe --- /dev/null +++ b/example/rootfs/etc/cont-init.d/load_modules.sh @@ -0,0 +1 @@ +/sbin/modprobe vhci-hcd \ No newline at end of file diff --git a/example/rootfs/etc/cont-init.d/remount_sys.sh b/example/rootfs/etc/cont-init.d/remount_sys.sh new file mode 100644 index 0000000..bcadb9f --- /dev/null +++ b/example/rootfs/etc/cont-init.d/remount_sys.sh @@ -0,0 +1 @@ +mount -o remount -t sysfs sysfs /sys \ No newline at end of file diff --git a/example/rootfs/etc/services.d/example/run b/example/rootfs/etc/services.d/example/run index 95d510f..6c329bd 100755 --- a/example/rootfs/etc/services.d/example/run +++ b/example/rootfs/etc/services.d/example/run @@ -17,4 +17,3 @@ bashio::log.info "${message:="Hello World..."}" ## Run your program exec /usr/bin/my_program -exec mount -o remount -t sysfs sysfs /sys