From 88613e99f889e1ce953f40d4a01362e183ad8938 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 19 Oct 2021 15:33:10 +0200 Subject: [PATCH] add smbclient to NAS enabled addons --- bazarr/Dockerfile | 2 ++ cloudcommander/Dockerfile | 11 ++++++----- doublecommander/Dockerfile | 1 + emby/Dockerfile | 1 + filebrowser/Dockerfile | 19 ++++++++++--------- grav/Dockerfile | 3 ++- jellyfin/Dockerfile | 1 + lidarr/Dockerfile | 13 +++++++------ papermerge/Dockerfile | 1 + photoprism/Dockerfile | 13 +++++++------ plex/Dockerfile | 6 +++--- prowlarr/Dockerfile | 15 ++++++++------- qbittorrent/Dockerfile | 17 +++++++++-------- radarr/Dockerfile | 13 +++++++------ readarr/Dockerfile | 13 +++++++------ requestrr/Dockerfile | 1 + resiliosync/Dockerfile | 1 + sonarr/Dockerfile | 13 +++++++------ transmission/Dockerfile | 1 + 19 files changed, 82 insertions(+), 63 deletions(-) diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile index 9fd33b7fc..d2bbe94c7 100644 --- a/bazarr/Dockerfile +++ b/bazarr/Dockerfile @@ -15,12 +15,14 @@ RUN \ cifs-utils \ keyutils \ samba \ + smbclient \ || apk add --no-cache \ jq \ curl \ cifs-utils \ keyutils \ samba \ + smbclient \ \ ################## # Install bashio # diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 5e371fdfa..f4f257229 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -9,11 +9,12 @@ RUN \ apt-get clean \ && apt-get update \ && apt-get install -y --no-install-recommends \ - jq \ - cifs-utils \ - keyutils \ - samba \ - nginx \ + jq \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ + nginx \ && apt-get clean \ \ ################## diff --git a/doublecommander/Dockerfile b/doublecommander/Dockerfile index 54b8ee179..89ee94a41 100644 --- a/doublecommander/Dockerfile +++ b/doublecommander/Dockerfile @@ -7,6 +7,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ jq \ samba \ + smbclient \ && curl -J -L -o /tmp/bashio.tar.gz \ "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ && mkdir /tmp/bashio \ diff --git a/emby/Dockerfile b/emby/Dockerfile index 768204239..2c4901844 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -18,6 +18,7 @@ RUN \ cifs-utils \ keyutils \ samba \ + smbclient \ \ ################## # Install bashio # diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile index 7fa01993b..25f4b97ce 100644 --- a/filebrowser/Dockerfile +++ b/filebrowser/Dockerfile @@ -8,15 +8,16 @@ RUN \ # Install apps # ################ apk add --no-cache \ - curl \ - jq \ - bash \ - cifs-utils \ - keyutils \ - samba \ - bind-tools \ - nginx \ - \ + curl \ + jq \ + bash \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ + bind-tools \ + nginx \ + \ ################## # Install bashio # ################## diff --git a/grav/Dockerfile b/grav/Dockerfile index c310d053a..237a6760b 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -20,6 +20,7 @@ RUN \ cifs-utils \ keyutils \ samba \ + smbclient \ \ ################### # Install bashio # @@ -32,7 +33,7 @@ RUN \ && rm -rf /tmp/bashio \ \ # use /data instead of /config for hass.io environment -# && sed -i "s|/config|/share/grav|g" /etc/services.d/grav/run \ + # && sed -i "s|/config|/share/grav|g" /etc/services.d/grav/run \ && sed -i "s|/config|/share/grav|g" /etc/cont-init.d/50-config \ && sed -i "s|/share/grav/nginx|/config/nginx|g" /etc/cont-init.d/50-config \ \ diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 777374c7e..0a1f78881 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -11,6 +11,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ jq \ samba \ + smbclient \ \ && apt-get -y upgrade cifs-utils \ \ diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 3131e485b..79993ab4a 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -4,17 +4,18 @@ FROM ${BUILD_FROM} ARG BASHIO_VERSION=0.13.1 RUN \ - ################ + ################ # Install apps # ################ apt-get clean \ && apt-get update \ && apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ \ ################### # Install bashio # diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index 91104ebd8..27d53d289 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -17,6 +17,7 @@ RUN \ cifs-utils \ keyutils \ samba \ + smbclient \ \ ################### # Install bashio # diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index e04a151d4..3e29ea8a8 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -15,12 +15,13 @@ RUN \ apt-get clean \ && apt-get update \ && apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ - coreutils \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ + coreutils \ \ ################## # Install bashio # diff --git a/plex/Dockerfile b/plex/Dockerfile index 0ff3e492c..a28967f0c 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -51,9 +51,9 @@ RUN \ && sed -i 's/with-contenv bash/with-contenv bashio/g' /etc/cont-init.d/45-plex-claim \ && sed -i '2iexport PLEX_CLAIM=$(bashio::config "claim")' /etc/cont-init.d/45-plex-claim \ && sed -i '3i[ $PLEX_CLAIM = "Get_from_https://www.plex.tv/claim" ] && bashio::log.warning "Please change the PLEX_CLAIM code from the options" && exit 1 || true' /etc/cont-init.d/45-plex-claim - ########### - # FOLDERS # - ########### +########### +# FOLDERS # +########### # && files=$(grep -rl '/config' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config|/data|g' \ # && sed -i "s|/config|/data|g" /defaults/plexmediaserver \ # && sed -i '2i cp -vnpr /config /data || true' /etc/cont-init.d/00-banner.sh diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 1c733a192..e43c6e717 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -11,11 +11,12 @@ RUN \ apt-get clean \ && apt-get update \ && apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ \ ################### # Install bashio # @@ -35,11 +36,11 @@ RUN \ && 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 \ - \ + \ # Correct permissions && sed -i 's|/config|-R /config/prowlarr|g' /etc/cont-init.d/10-adduser \ && sed -i 's= /config=/config/prowlarr || true=g' /etc/cont-init.d/30-config \ && sed -i 's|/config|/config/prowlarr|g' /etc/services.d/prowlarr/run - + # copy local files COPY root/ / diff --git a/qbittorrent/Dockerfile b/qbittorrent/Dockerfile index d7714c550..1d7c75751 100644 --- a/qbittorrent/Dockerfile +++ b/qbittorrent/Dockerfile @@ -14,14 +14,15 @@ RUN \ apt-get clean \ && apt-get update \ && apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ - nginx \ - coreutils \ - openvpn \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ + nginx \ + coreutils \ + openvpn \ && apt-get clean \ \ ################## diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 8f595b71a..f757fb57e 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -4,17 +4,18 @@ FROM ${BUILD_FROM} ARG BASHIO_VERSION=0.13.1 RUN \ - ################ + ################ # Install apps # ################ apt-get clean \ && apt-get update \ && apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ \ ################### # Install bashio # diff --git a/readarr/Dockerfile b/readarr/Dockerfile index db45d9ff3..353eae168 100644 --- a/readarr/Dockerfile +++ b/readarr/Dockerfile @@ -4,17 +4,18 @@ FROM ${BUILD_FROM} ARG BASHIO_VERSION=0.13.1 RUN \ - ################ + ################ # Install apps # ################ apt-get clean \ && apt-get update \ && apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ \ ################### # Install bashio # diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 68f90c411..f105f0a46 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -15,6 +15,7 @@ RUN \ cifs-utils \ keyutils \ samba \ + smbclient \ \ ################### # Install bashio # diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index 96b6c3d35..d88356aee 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -14,6 +14,7 @@ RUN \ cifs-utils \ keyutils \ samba \ + smbclient \ \ ################## # Install bashio # diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index 2f1121ba6..9bcda3b22 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -5,17 +5,18 @@ FROM ${BUILD_FROM} ARG BASHIO_VERSION=0.13.1 RUN \ - ################ + ################ # Install apps # ################ apt-get clean \ && apt-get update \ && apt-get install -y \ - jq \ - curl \ - cifs-utils \ - keyutils \ - samba \ + jq \ + curl \ + cifs-utils \ + keyutils \ + samba \ + smbclient \ \ ################## # Install bashio # diff --git a/transmission/Dockerfile b/transmission/Dockerfile index 257901035..d0caf88ae 100644 --- a/transmission/Dockerfile +++ b/transmission/Dockerfile @@ -7,6 +7,7 @@ RUN apk add --no-cache \ curl \ jq \ samba \ + smbclient \ && curl -J -L -o /tmp/bashio.tar.gz \ "https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ && mkdir /tmp/bashio \