diff --git a/example/CHANGELOG.md b/example/CHANGELOG.md index beaf414..e69de29 100644 --- a/example/CHANGELOG.md +++ b/example/CHANGELOG.md @@ -1,15 +0,0 @@ - - -## 1.2.0 - -- Add an apparmor profile -- Update to 3.15 base image with s6 v3 -- Add a sample script to run as service and constrain in aa profile - -## 1.1.0 - -- Updates - -## 1.0.0 - -- Initial release diff --git a/example/DOCS.md b/example/DOCS.md index b8432c3..c231400 100644 --- a/example/DOCS.md +++ b/example/DOCS.md @@ -1,10 +1,3 @@ -# Home Assistant Add-on: Example add-on +# Home Assistant Add-on: MPD -## How to use - -This add-on really does nothing. It is just an example. - -When started it will print the configured message or "Hello world" in the log. - -It will also print "All done!" in `/share/example_addon_output.txt` to show -simple example of the usage of `map` in addon config. +docs \ No newline at end of file diff --git a/example/Dockerfile b/example/Dockerfile index 9d1a983..ddeb88d 100644 --- a/example/Dockerfile +++ b/example/Dockerfile @@ -1,12 +1,4 @@ -# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile ARG BUILD_FROM FROM $BUILD_FROM -# 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}" - -# Copy root filesystem COPY rootfs / diff --git a/example/apparmor.txt b/example/apparmor.txt deleted file mode 100644 index e788a6c..0000000 --- a/example/apparmor.txt +++ /dev/null @@ -1,57 +0,0 @@ -#include - -profile example flags=(attach_disconnected,mediate_deleted) { - #include - - # Capabilities - file, - signal (send) set=(kill,term,int,hup,cont), - - # S6-Overlay - /init ix, - /bin/** ix, - /usr/bin/** ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /run/{,**} rwk, - /dev/tty rw, - - # Bashio - /usr/lib/bashio/** ix, - /tmp/** rwk, - - # Access to options.json and other files within your addon - /data/** rw, - - # Start new profile for service - /usr/bin/my_program cx -> my_program, - - profile my_program flags=(attach_disconnected,mediate_deleted) { - #include - - # Receive signals from S6-Overlay - signal (receive) peer=*_example, - - # Access to options.json and other files within your addon - /data/** rw, - - # Access to mapped volumes specified in config.json - /share/** rw, - - # Access required for service functionality - # Note: List was built by doing the following: - # 1. Add what is obviously needed based on what is in the script - # 2. Add `complain` as a flag to this profile temporarily and run the addon - # 3. Review the audit log with `journalctl _TRANSPORT="audit" -g 'apparmor="ALLOWED"'` and add other access as needed - # Remember to remove the `complain` flag when you are done - /usr/bin/my_program r, - /bin/bash rix, - /bin/echo ix, - /etc/passwd r, - /dev/tty rw, - } -} \ No newline at end of file diff --git a/example/build.yaml b/example/build.yaml index 8f7b01c..1f938b7 100644 --- a/example/build.yaml +++ b/example/build.yaml @@ -1,14 +1,11 @@ -# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile build_from: - aarch64: "ghcr.io/home-assistant/aarch64-base:3.15" - amd64: "ghcr.io/home-assistant/amd64-base:3.15" - armhf: "ghcr.io/home-assistant/armhf-base:3.15" - armv7: "ghcr.io/home-assistant/armv7-base:3.15" - i386: "ghcr.io/home-assistant/i386-base:3.15" + aarch64: "ghcr.io/home-assistant/aarch64-base:3.20" + amd64: "ghcr.io/home-assistant/amd64-base:3.20" + armhf: "ghcr.io/home-assistant/armhf-base:3.20" + armv7: "ghcr.io/home-assistant/armv7-base:3.20" + i386: "ghcr.io/home-assistant/i386-base:3.20" labels: - org.opencontainers.image.title: "Home Assistant Add-on: New Example add-on" - org.opencontainers.image.description: "New Example add-on to use as a blueprint for new add-ons." - org.opencontainers.image.source: "https://github.com/home-assistant/addons-example" - org.opencontainers.image.licenses: "Apache License 2.0" -args: - TEMPIO_VERSION: "2021.09.0" + org.opencontainers.image.title: "Home Assistant Add-on: MPD" + org.opencontainers.image.description: "MPD Addon" + org.opencontainers.image.source: "https://forgejo.owo.monster/chaos/hass-mpd/src/branch/main/mpd" + org.opencontainers.image.licenses: "MIT" diff --git a/example/config.yaml b/example/config.yaml index 102ef25..a398202 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -1,20 +1,24 @@ -# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-config -name: New Example add-on -version: "1.3.0" -slug: example -description: New Example add-on -url: "https://github.com/home-assistant/addons-example/tree/main/example" +name: MPD +version: "0.0.1" +slug: mpd +description: MPD Addon +url: "https://forgejo.owo.monster/chaos/hass-mpd/src/branch/main/mpd" arch: - armhf - armv7 - aarch64 - amd64 - i386 +apparmor: false +realtime: true init: false +audio: true +devices: + - /dev/snd map: - share:rw -options: - message: "Hello world..." -schema: - message: "str?" -image: "ghcr.io/home-assistant/{arch}-addon-example" + - media:rw +ports: + 6600/tcp: 6600 +ports_description: + 6600/tcp: MPD \ No newline at end of file diff --git a/example/icon.png b/example/icon.png index d4415c1..0063045 100644 Binary files a/example/icon.png and b/example/icon.png differ diff --git a/example/logo.png b/example/logo.png index 106e5c2..fd42286 100644 Binary files a/example/logo.png and b/example/logo.png differ diff --git a/mpd/root/etc/mpd.conf b/example/rootfs/etc/mpd.conf similarity index 100% rename from mpd/root/etc/mpd.conf rename to example/rootfs/etc/mpd.conf diff --git a/mpd/root/etc/s6-overlay/s6-rc.d/mpd/producer-for b/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for similarity index 100% rename from mpd/root/etc/s6-overlay/s6-rc.d/mpd/producer-for rename to example/rootfs/etc/s6-overlay/s6-rc.d/mpd/producer-for diff --git a/mpd/root/etc/s6-overlay/s6-rc.d/mpd/run b/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run similarity index 100% rename from mpd/root/etc/s6-overlay/s6-rc.d/mpd/run rename to example/rootfs/etc/s6-overlay/s6-rc.d/mpd/run diff --git a/mpd/root/etc/s6-overlay/s6-rc.d/mpd/type b/example/rootfs/etc/s6-overlay/s6-rc.d/mpd/type similarity index 100% rename from mpd/root/etc/s6-overlay/s6-rc.d/mpd/type rename to example/rootfs/etc/s6-overlay/s6-rc.d/mpd/type diff --git a/mpd/root/etc/s6-overlay/s6-rc.d/user/contents.d/mpd b/example/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpd similarity index 100% rename from mpd/root/etc/s6-overlay/s6-rc.d/user/contents.d/mpd rename to example/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/mpd diff --git a/example/rootfs/etc/services.d/example/finish b/example/rootfs/etc/services.d/example/finish deleted file mode 100755 index 230d179..0000000 --- a/example/rootfs/etc/services.d/example/finish +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env bashio -# ============================================================================== -# Take down the S6 supervision tree when example fails -# s6-overlay docs: https://github.com/just-containers/s6-overlay -# ============================================================================== - -declare APP_EXIT_CODE=${1} - -if [[ "${APP_EXIT_CODE}" -ne 0 ]] && [[ "${APP_EXIT_CODE}" -ne 256 ]]; then - bashio::log.warning "Halt add-on with exit code ${APP_EXIT_CODE}" - echo "${APP_EXIT_CODE}" > /run/s6-linux-init-container-results/exitcode - exec /run/s6/basedir/bin/halt -fi - -bashio::log.info "Service restart after closing" diff --git a/example/rootfs/etc/services.d/example/run b/example/rootfs/etc/services.d/example/run deleted file mode 100755 index 6c329bd..0000000 --- a/example/rootfs/etc/services.d/example/run +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Start the example service -# s6-overlay docs: https://github.com/just-containers/s6-overlay -# ============================================================================== - -# Add your code here - -# Declare variables -declare message - -## Get the 'message' key from the user config options. -message=$(bashio::config 'message') - -## Print the message the user supplied, defaults to "Hello World..." -bashio::log.info "${message:="Hello World..."}" - -## Run your program -exec /usr/bin/my_program diff --git a/example/rootfs/usr/bin/my_program b/example/rootfs/usr/bin/my_program deleted file mode 100755 index a287b13..0000000 --- a/example/rootfs/usr/bin/my_program +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo "All done!" > /share/example_addon_output.txt diff --git a/example/translations/en.yaml b/example/translations/en.yaml index 70de024..33a1164 100644 --- a/example/translations/en.yaml +++ b/example/translations/en.yaml @@ -1,4 +1 @@ -configuration: - message: - name: Message - description: The message that will be printed to the log when starting this example add-on. +configuration: \ No newline at end of file diff --git a/mpd/CHANGELOG.md b/mpd/CHANGELOG.md deleted file mode 100644 index e69de29..0000000 diff --git a/mpd/DOCS.md b/mpd/DOCS.md deleted file mode 100644 index e69de29..0000000 diff --git a/mpd/Dockerfile b/mpd/Dockerfile deleted file mode 100644 index 9911fa2..0000000 --- a/mpd/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -ARG BUILD_FROM -FROM $BUILD_FROM - -RUN apk add --no-cache \ - mpc=0.35-r0 \ - mpd=0.23.15-r2 \ - ympd=1.3.0-r12 - -ENTRYPOINT [ "/init" ] -CMD [] -COPY root / diff --git a/mpd/README.md b/mpd/README.md deleted file mode 100644 index e69de29..0000000 diff --git a/mpd/build.yaml b/mpd/build.yaml deleted file mode 100644 index 3ea5f66..0000000 --- a/mpd/build.yaml +++ /dev/null @@ -1,11 +0,0 @@ -build_from: - armhf: ghcr.io/home-assistant/armhf-base:3.21 - armv7: ghcr.io/home-assistant/armv7-base:3.21 - aarch64: ghcr.io/home-assistant/aarch64-base:3.21 - amd64: ghcr.io/home-assistant/amd64-base:3.21 - i386: ghcr.io/home-assistant/i386-base:3.21 -labels: - org.opencontainers.image.title: "MPD" - org.opencontainers.image.description: "MPD Addon" - org.opencontainers.image.source: "https://forgejo.owo.monster/chaos/hass-mpd" - org.opencontainers.image.licenses: "MIT" \ No newline at end of file diff --git a/mpd/config.yaml b/mpd/config.yaml deleted file mode 100644 index b15adcb..0000000 --- a/mpd/config.yaml +++ /dev/null @@ -1,27 +0,0 @@ -name: MPD -version: "0.1" -slug: mpd -panel_icon: mdi:music-circle -description: MPD Addon -url: https://forgejo.owo.monster/chaos/hass-mpd -arch: - - armv7 - - armhf - - aarch64 - - amd64 - - i386 -apparmor: false -realtime: true -init: false -audio: true -devices: - - /dev/snd -map: - - share:rw - - media:rw -ports: - 6600/tcp: 6600 -ports_description: - 6600/tcp: MPD -options: -schema: diff --git a/mpd/icon.png b/mpd/icon.png deleted file mode 100644 index 0063045..0000000 Binary files a/mpd/icon.png and /dev/null differ diff --git a/mpd/logo.png b/mpd/logo.png deleted file mode 100644 index fd42286..0000000 Binary files a/mpd/logo.png and /dev/null differ