New logic

2026-07-05 21:48:47 +02:00 · 2021-12-14 13:39:15 +01:00
parent 6df150b341
commit 90f333c40d
269 changed files with 6071 additions and 2163 deletions
--- a/booksonic_air/CHANGELOG.md
+++ b/booksonic_air/CHANGELOG.md
@@ -1,3 +1,8 @@
+
+## v2112.1.0-ls38 (12-12-2021)
+- Update to latest version from linuxserver/docker-booksonic-air
+- New standardized logic for Dockerfile build and packages installation
+
 ## nightly-0.1.0.1024-ls29 (14-11-2021)

 - Update to latest version from linuxserver/docker-booksonic-air
--- a/booksonic_air/Dockerfile
+++ b/booksonic_air/Dockerfile
@@ -1,7 +1,30 @@
+#################
+# 1 Build Image #
+#################
+
 ARG BUILD_FROM
 ARG BUILD_VERSION
-FROM linuxserver/booksonic-air:latest
-ENV BASHIO_VERSION=0.14.3
+FROM $BUILD_FROM
+
+##################
+# 2 Modify Image #
+##################
+
+ENV BOOKSONIC_AIR_SETTINGS="/data"
+RUN \
+    # Allow UID and GID setting
+    sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
+    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser || true
+
+##################
+# 3 Install apps #
+##################
+
+# Add rootfs
+COPY rootfs/ /
+
+# Manual apps
 ENV PACKAGES="jq \
    curl \
    cifs-utils \
@@ -9,38 +32,28 @@ ENV PACKAGES="jq \
    samba \
    smbclient"

-RUN \
-    ################
-    # Install apps #
-    ################
-    apt-get clean \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends ${PACKAGES} \
-    \ 
-    ###################
-    # Install bashio #
-    ##################
-    && mkdir -p /tmp/bashio \
-    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
-    | tar -xzf - --strip 1 -C /tmp/bashio \
-    && mv /tmp/bashio/lib /usr/lib/bashio \
-    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -rf /tmp/bashio
+# Automatic apps & bashio
+RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \
+    if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \
+    curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \
+    chmod 777 /automatic_packages.sh && \
+    /automatic_packages.sh "${PACKAGES:-}" && \
+    rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE

-#################
-# Correct image #
-#################
-RUN \
-    # Allow UID and GID setting
-    sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
-    && sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
-    && sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser || true
+################
+# 4 Entrypoint #
+################

-# copy local files
-COPY root/ / 
-ENV BOOKSONIC_AIR_SETTINGS="/data"
+#RUN chmod 777 /entrypoint.sh
+#WORKDIR /
+#ENTRYPOINT [ "/usr/bin/env" ]
+#CMD [ "/entrypoint.sh" ] 
+#SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
+############
+# 5 Labels #
+############

-### LABELS
 ARG BUILD_ARCH
 ARG BUILD_DATE
 ARG BUILD_DESCRIPTION
--- a/booksonic_air/build.json
+++ b/booksonic_air/build.json
@@ -0,0 +1,8 @@
+{
+  "build_from": {
+    "armhf": "linuxserver/booksonic-air:arm32v7-latest",
+    "armv7": "linuxserver/booksonic-air:arm32v7-latest",
+    "aarch64": "linuxserver/booksonic-air:arm64v8-latest",
+    "amd64": "linuxserver/booksonic-air:amd64-latest"
+  }
+}
--- a/booksonic_air/config.json
+++ b/booksonic_air/config.json
@@ -1,6 +1,11 @@
 {
  "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+    "armhf"
+  ],
  "boot": "auto",
  "description": "platform for accessing the audibooks you own wherever you are",
  "devices": [
@@ -35,7 +40,10 @@
    "PUID": "0",
    "PGID": "0"
  },
-  "map": ["share:rw", "media:rw"],
+  "map": [
+    "share:rw",
+    "media:rw"
+  ],
  "name": "Booksonic-air",
  "options": {
    "PUID": 0,
@@ -50,7 +58,10 @@
  "ports_description": {
    "4040/tcp": "web interface"
  },
-  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
+  "privileged": [
+    "SYS_ADMIN",
+    "DAC_READ_SEARCH"
+  ],
  "schema": {
    "PUID": "int",
    "PGID": "int",
@@ -61,8 +72,8 @@
    "cifspassword": "str?"
  },
  "slug": "booksonic-air_nas",
-  "upstream": "v2009.1.0-ls37",
+  "upstream": "v2112.1.0-ls38",
  "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "v2009.1.0-ls37",
+  "version": "v2112.1.0-ls38",
  "webui": "http://[HOST]:[PORT:4040]"
 }
--- a/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
+++ b/booksonic_air/rootfs/etc/cont-init.d/00-aaa_dockerfile_backup.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+# If dockerfile failed install manually
+if [ -e "/ENVFILE" ]; then
+    echo "Executing script"
+    PACKAGES=$(</ENVFILE)
+    (
+        #######################
+        # Automatic installer #
+        #######################
+        if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi &&
+            if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi &&
+            curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh &&
+            chmod 777 /automatic_packages.sh &&
+            eval /./automatic_packages.sh "$PACKAGES" &&
+            rm /automatic_packages.sh
+    ) >/dev/null
+
+fi
--- a/booksonic_air/rootfs/etc/cont-init.d/00-banner.sh
+++ b/booksonic_air/rootfs/etc/cont-init.d/00-banner.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/with-contenv bashio
+# ==============================================================================
+# Displays a simple add-on banner on startup
+# ==============================================================================
+
+if bashio::supervisor.ping; then
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+    bashio::log.blue " Add-on: $(bashio::addon.name)"
+    bashio::log.blue " $(bashio::addon.description)"
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+
+    bashio::log.blue " Add-on version: $(bashio::addon.version)"
+    if bashio::var.true "$(bashio::addon.update_available)"; then
+        bashio::log.magenta ' There is an update available for this add-on!'
+        bashio::log.magenta \
+            " Latest add-on version: $(bashio::addon.version_latest)"
+        bashio::log.magenta ' Please consider upgrading as soon as possible.'
+    else
+        bashio::log.green ' You are running the latest version of this add-on.'
+    fi
+
+    bashio::log.blue " System: $(bashio::info.operating_system)" \
+        " ($(bashio::info.arch) / $(bashio::info.machine))"
+    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+    bashio::log.blue \
+        ' Please, share the above information when looking for help'
+    bashio::log.blue \
+        ' or support in, e.g., GitHub, forums'
+    bashio::log.green \
+        ' https://github.com/alexbelgium/hassio-addons'
+    bashio::log.blue \
+        '-----------------------------------------------------------'
+fi
--- a/booksonic_air/rootfs/etc/cont-init.d/92-local_mounts.sh
+++ b/booksonic_air/rootfs/etc/cont-init.d/92-local_mounts.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/with-contenv bashio
+
+######################
+# MOUNT LOCAL SHARES #
+######################
+
+# Mount local Share if configured
+if bashio::config.has_value 'localdisks'; then
+
+  MOREDISKS=$(bashio::config 'localdisks')
+  echo "Local Disks mounting..."
+
+  # Separate comma separated values
+  for disk in ${MOREDISKS//,/ }; do
+
+    # Mount by device as default
+    devpath=/dev
+
+    # Mount as label
+    [ ${disk:0:2} != "sd" ] && devpath=/dev/disk/by-label
+
+    # Creates dir
+    mkdir -p /mnt/$disk
+    chown -R $(id -u):$(id -g) /mnt/$disk
+    # Legacy mounting : mount to share if still exists (avoid breaking changes)
+    [ -d /share/$disk ] && mount $devpath/$disk /share/$disk || true
+    # Mount
+    mount $devpath/$disk /mnt/$disk && bashio::log.info "Success! $disk mounted to /mnt/$disk" || (bashio::log.fatal "Unable to mount local drives! Please check the name." && rmdir /mnt/$disk)
+
+  done
+
+fi
--- a/booksonic_air/rootfs/etc/cont-init.d/92-smb_mounts.sh
+++ b/booksonic_air/rootfs/etc/cont-init.d/92-smb_mounts.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/with-contenv bashio
+
+#########################
+# MOUNT SMB SHARES v1.6 #
+#########################
+if bashio::config.has_value 'networkdisks'; then
+
+  # Define variables
+  MOREDISKS=$(bashio::config 'networkdisks')
+  CIFS_USERNAME=$(bashio::config 'cifsusername')
+  CIFS_PASSWORD=$(bashio::config 'cifspassword')
+  MOUNTED=false
+  SMBVERS=""
+  SECVERS=""
+
+  # Mount CIFS Share if configured and if Protection Mode is active
+  echo 'Mounting smb share(s)...'
+
+  if bashio::config.has_value 'cifsdomain'; then
+    DOMAIN=",domain=$(bashio::config 'cifsdomain')"
+  else
+    DOMAIN=""
+  fi
+
+  # Mounting disks
+  for disk in ${MOREDISKS//,/ }; do # Separate comma separated values
+
+    # Clean name of network share
+    disk=$(echo $disk | sed "s,/$,,") # Remove / at end of name
+    diskname=${disk//\\//}            #replace \ with /
+    diskname=${diskname##*/}          # Get only last part of the name
+
+    # Data validation
+    if [[ ! $disk =~ ^.*+[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[/]+.*+$ ]]; then
+      bashio::log.fatal "The structure of your \"networkdisks\" option : \"$disk\" doesn't seem correct, please use a structure like //123.12.12.12/sharedfolder,//123.12.12.12/sharedfolder2. If you don't use it, you can simply remove the text, this will avoid this error message in the future."
+      exit 0
+    fi
+
+    # Prepare mount point
+    mkdir -p /mnt/$diskname
+    chown -R root:root /mnt/$diskname
+
+    #Tries to mount with default options
+    mount -t cifs -o rw,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$DOMAIN $disk /mnt/$diskname 2>ERRORCODE && MOUNTED=true || MOUNTED=false
+
+    # if Fail test different smb and sec versions
+    if [ $MOUNTED = false ]; then
+      for SMBVERS in ",vers=3" ",vers=1.0" ",vers=2.1" ",vers=3.0" ",nodfs" ",uid=0,gid=0,forceuid,forcegid" ",noforceuid,noforcegid" ",${DOMAIN:-WORKGROUP}"; do
+        mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS $disk /mnt/$diskname 2>/dev/null && MOUNTED=true && break || MOUNTED=false
+        for SECVERS in ",sec=ntlmi" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=ntlm" ",sec=krb5i" ",sec=krb5" ",iocharset=utf8"; do
+          mount -t cifs -o rw,file_mode=0777,dir_mode=0777,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS $disk /mnt/$disk name 2>/dev/null && MOUNTED=true && break 2 && break || MOUNTED=false
+        done
+      done
+    fi
+
+    # Messages
+    if [ $MOUNTED = true ] && [ "mountpoint -q /mnt/$diskname" ]; then
+      #Test write permissions
+      touch /mnt/$diskname/testaze && rm /mnt/$diskname/testaze &&
+        bashio::log.info "... $disk successfully mounted to /mnt/$diskname with options $SMBVERS$SECVERS" ||
+        bashio::log.fatal "Disk is mounted, however unable to write in the shared disk. Please check UID/GID for permissions, and if the share is rw"
+
+    else
+      # Mounting failed messages
+      bashio::log.fatal "Error, unable to mount $disk to /mnt/$diskname with username $CIFS_USERNAME, $CIFS_PASSWORD. Please check your remote share path, username, password, domain, try putting 0 in UID and GID"
+      bashio::log.fatal "Here is some debugging info :"
+
+      # Provide debugging info
+      smbclient -V &>/dev/null || apt-get install smbclient || apk add --no-cache samba-client
+      #smbclient $disk -U $CIFS_USERNAME%$CIFS_PASSWORD  || true
+      smbclient -L $disk -U $CIFS_USERNAME%$CIFS_PASSWORD || true
+
+      # Error code
+      bashio::log.fatal "Error read : $(<ERRORCODE)"
+      rm ERRORCODE
+
+      # clean folder
+      umount /mnt/$diskname 2>/dev/null || true
+      rmdir /mnt/$diskname || true
+    fi
+
+  done
+fi