Clean bashio code

2026-01-11 10:21:02 +01:00 · 2021-10-23 22:45:38 +02:00
parent e3c741d315
commit 3a54fe2b6c
14 changed files with 19 additions and 41 deletions
--- a/cloudcommander/Dockerfile
+++ b/cloudcommander/Dockerfile
@@ -25,10 +25,7 @@ RUN \
    | 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 \
-    \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/*
+    && rm -rf /tmp/bashio

 # Copy root filesystem
 COPY rootfs / 
--- a/code-server/Dockerfile
+++ b/code-server/Dockerfile
@@ -17,11 +17,6 @@ RUN apt-get update \
    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
    && rm -rf /tmp/bashio \
    \
-    && mv /tmp/bashio/lib /usr/lib/bashio \
-    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -fr \
-    /tmp/* \
-    /var/lib/apt/lists/* \
    # 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 \
--- a/doublecommander/Dockerfile
+++ b/doublecommander/Dockerfile
@@ -19,12 +19,6 @@ RUN apt-get update \
    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
    && rm -rf /tmp/bashio \
    \
-    && mv /tmp/bashio/lib /usr/lib/bashio \
-    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -fr \
-    /tmp/* \
-    /var/lib/apt/lists/* \
-    \
    # 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 \
--- a/emby/Dockerfile
+++ b/emby/Dockerfile
@@ -30,9 +30,6 @@ RUN \
    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
    && rm -rf /tmp/bashio \
    \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/* \
-    \
    #############################
    # Allow UID and GID setting #
    #############################
--- a/flexget/Dockerfile
+++ b/flexget/Dockerfile
@@ -22,12 +22,6 @@ RUN \
    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
    && rm -rf /tmp/bashio \
    \
-    && mv /tmp/bashio/lib /usr/lib/bashio \
-    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-    && rm -fr \
-    /tmp/* \
-    /var/lib/apt/lists/* \
-    \
    ###############
    # Adapt image #
    ###############
--- a/jackett/Dockerfile
+++ b/jackett/Dockerfile
@@ -3,7 +3,11 @@ ARG BUILD_VERSION
 FROM ${BUILD_FROM}
 ARG BASHIO_VERSION=0.13.1

-RUN curl -J -L -o /tmp/bashio.tar.gz \
+RUN \
+    ##################
+    # Install bashio #
+    ##################
+    curl -J -L -o /tmp/bashio.tar.gz \
    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
    && mkdir /tmp/bashio \
    && tar zxvf \
--- a/jellyfin/Dockerfile
+++ b/jellyfin/Dockerfile
@@ -25,10 +25,6 @@ RUN apt-get update \
    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
    && rm -rf /tmp/bashio \
    \
-    && rm -fr \
-    /tmp/* \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/* \
    # 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 \
--- a/joal/Dockerfile
+++ b/joal/Dockerfile
@@ -17,7 +17,9 @@ RUN \
    wget \
    jq \
    nginx \
-    #Install bashio
+    ##################
+    # Install bashio #
+    ##################
    && curl -J -L -o /tmp/bashio.tar.gz \
    "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
    && mkdir /tmp/bashio \
--- a/nextcloud/Dockerfile
+++ b/nextcloud/Dockerfile
@@ -11,7 +11,9 @@ ARG BASHIO_VERSION=0.13.1
 # Add bashio
 RUN \
    echo "Install version $BUILD_VERSION on $BUILD_ARCH" \
-    #Install bashio
+    ##################
+    # Install bashio #
+    ##################
    && echo "**** Install Bashio ****" \
    && apk add --no-cache \
    curl jq \
--- a/papermerge/Dockerfile
+++ b/papermerge/Dockerfile
@@ -19,7 +19,7 @@ RUN \
    samba \
    smbclient \
    \ 
-    ###################
+    ##################
    # Install bashio #
    ##################
    && mkdir -p /tmp/bashio \
--- a/photoprism/Dockerfile
+++ b/photoprism/Dockerfile
@@ -33,9 +33,6 @@ RUN \
    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
    && rm -rf /tmp/bashio \
    \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/* \
-    \ 
    ###################
    # Configure image #
    ###################
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -32,9 +32,6 @@ RUN \
    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
    && rm -rf /tmp/bashio \
    \
-    /var/{cache,log}/* \
-    /var/lib/apt/lists/* \
-    \
    #############################
    # Allow UID and GID setting #
    #############################
--- a/requestrr/Dockerfile
+++ b/requestrr/Dockerfile
@@ -17,7 +17,7 @@ RUN \
    samba \
    smbclient \
    \ 
-    ###################
+    ##################
    # Install bashio #
    ##################
    && mkdir -p /tmp/bashio \
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -26,13 +26,16 @@ RUN \
        "https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \
    && chmod a+x /usr/bin/tempio \
    \
-# Install bashio
+    ##################
+    # 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 \
+    | 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 \
+    \
 # 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 \