From d640e6a02eb950cd30b2fc6fc09393c2f76a2522 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Mon, 10 Jan 2022 09:45:20 +0100 Subject: [PATCH] duplicate installation --- booksonic_air/Dockerfile | 4 +--- cloudcommander/Dockerfile | 2 -- grav/Dockerfile | 4 +--- jellyfin/Dockerfile | 5 +---- lidarr/Dockerfile | 4 +--- paperless_ng/Dockerfile | 8 +------- papermerge/Dockerfile | 4 +--- photoprism/Dockerfile | 4 +--- plex/Dockerfile | 4 +--- prowlarr/Dockerfile | 4 +--- radarr/Dockerfile | 4 +--- requestrr/Dockerfile | 4 +--- resiliosync/Dockerfile | 4 +--- sonarr/Dockerfile | 4 +--- ubooquity/Dockerfile | 1 - webtop/Dockerfile | 6 +----- 16 files changed, 14 insertions(+), 52 deletions(-) diff --git a/booksonic_air/Dockerfile b/booksonic_air/Dockerfile index 0455489ed..e806d2cbd 100644 --- a/booksonic_air/Dockerfile +++ b/booksonic_air/Dockerfile @@ -39,9 +39,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/cloudcommander/Dockerfile b/cloudcommander/Dockerfile index 22ae9af6c..8a5c24877 100644 --- a/cloudcommander/Dockerfile +++ b/cloudcommander/Dockerfile @@ -31,8 +31,6 @@ COPY rootfs/ / ENV PACKAGES="jq \ cifs-utils \ keyutils \ - samba \ - smbclient \ nginx" # Automatic apps & bashio diff --git a/grav/Dockerfile b/grav/Dockerfile index 9e41f2737..fb8f5a164 100644 --- a/grav/Dockerfile +++ b/grav/Dockerfile @@ -42,9 +42,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - samba-client" + keyutils" # 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 && \ diff --git a/jellyfin/Dockerfile b/jellyfin/Dockerfile index 4f4094a10..472028d30 100644 --- a/jellyfin/Dockerfile +++ b/jellyfin/Dockerfile @@ -38,10 +38,7 @@ RUN \ COPY rootfs/ / # Manual apps -ENV PACKAGES="jq \ - samba \ - cifs-utils \ - smbclient" +ENV PACKAGES="" # 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 && \ diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile index 09b5a564a..471a8d12d 100644 --- a/lidarr/Dockerfile +++ b/lidarr/Dockerfile @@ -42,9 +42,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/paperless_ng/Dockerfile b/paperless_ng/Dockerfile index 48798e367..fc30ce0b8 100644 --- a/paperless_ng/Dockerfile +++ b/paperless_ng/Dockerfile @@ -42,13 +42,7 @@ RUN \ COPY rootfs/ / # Manual apps -ENV PACKAGES="jq \ - curl \ - cifs-utils \ - keyutils \ - smbclient \ - samba \ - yamllint \ +ENV PACKAGES="yamllint \ pip \ libxml2-dev libxslt-dev python-dev libjpeg-dev zlib1g-dev python3-dev build-essential" diff --git a/papermerge/Dockerfile b/papermerge/Dockerfile index dfb164798..82e4a6af7 100644 --- a/papermerge/Dockerfile +++ b/papermerge/Dockerfile @@ -41,9 +41,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/photoprism/Dockerfile b/photoprism/Dockerfile index dde82fa70..ef3204383 100644 --- a/photoprism/Dockerfile +++ b/photoprism/Dockerfile @@ -34,7 +34,7 @@ RUN \ chmod -Rf a+rwx /data/photoprism && \ # rename entrypoint mv /entrypoint.sh /entrypoint_photoprism.sh - + ################## # 3 Install apps # @@ -48,8 +48,6 @@ ENV PACKAGES="jq \ curl \ cifs-utils \ keyutils \ - samba \ - smbclient \ coreutils" # Automatic apps & bashio diff --git a/plex/Dockerfile b/plex/Dockerfile index 8bcd3a6e7..e8f25cc15 100644 --- a/plex/Dockerfile +++ b/plex/Dockerfile @@ -53,9 +53,7 @@ COPY rootfs/ / # Manual apps ENV PACKAGES="jq \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile index 26c4ac082..3cb8ab0a2 100644 --- a/prowlarr/Dockerfile +++ b/prowlarr/Dockerfile @@ -43,9 +43,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/radarr/Dockerfile b/radarr/Dockerfile index 4e85ced3b..bb876d50d 100644 --- a/radarr/Dockerfile +++ b/radarr/Dockerfile @@ -44,9 +44,7 @@ ENV BASHIO_VERSION=0.14.3 ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/requestrr/Dockerfile b/requestrr/Dockerfile index 0de323f7a..2e1a7f209 100644 --- a/requestrr/Dockerfile +++ b/requestrr/Dockerfile @@ -42,9 +42,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile index f68ac349d..fd87d67ed 100644 --- a/resiliosync/Dockerfile +++ b/resiliosync/Dockerfile @@ -52,9 +52,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile index fb3f42ca7..1dd833184 100644 --- a/sonarr/Dockerfile +++ b/sonarr/Dockerfile @@ -43,9 +43,7 @@ COPY rootfs/ / ENV PACKAGES="jq \ curl \ cifs-utils \ - keyutils \ - samba \ - smbclient" + keyutils" # 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 && \ diff --git a/ubooquity/Dockerfile b/ubooquity/Dockerfile index 54dfd5935..d314458ee 100644 --- a/ubooquity/Dockerfile +++ b/ubooquity/Dockerfile @@ -50,7 +50,6 @@ COPY rootfs/ / ENV PACKAGES="curl \ jq \ moreutils \ - samba \ nginx" # Automatic apps & bashio diff --git a/webtop/Dockerfile b/webtop/Dockerfile index 65523a0c7..744220cdd 100644 --- a/webtop/Dockerfile +++ b/webtop/Dockerfile @@ -42,11 +42,7 @@ RUN apt-get update && apt-get dist-upgrade && apt-get install -yqq libgles2-mesa COPY rootfs/ / # Manual apps -ENV PACKAGES="curl \ - jq \ - cifs-utils \ - keyutils \ - samba" +ENV PACKAGES="" # 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 && \