From e09a7359c2e97f353e62bb453aeb3238cad25ca1 Mon Sep 17 00:00:00 2001
From: Alexandre <alexandre.pary@gmail.com>
Date: Thu, 20 Jan 2022 21:08:38 +0100
Subject: [PATCH] hadolint

---
 ombi/Dockerfile         | 2 ++
 organizr/Dockerfile     | 1 +
 paperless_ng/Dockerfile | 1 +
 plex/Dockerfile         | 1 +
 portainer/Dockerfile    | 1 +
 resiliosync/Dockerfile  | 1 +
 scrutiny/Dockerfile     | 1 +
 webtop/Dockerfile       | 3 ++-
 webtrees/Dockerfile     | 1 +
 9 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ombi/Dockerfile b/ombi/Dockerfile
index 979305d69..ff740f793 100644
--- a/ombi/Dockerfile
+++ b/ombi/Dockerfile
@@ -22,6 +22,8 @@ FROM ${BUILD_FROM}
 # 2 Modify Image #
 ##################
 
+# hadolint ignore=DL4006
+# hadolint ignore=SC2015
 RUN \
     # Allow UID and GID setting
     sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
diff --git a/organizr/Dockerfile b/organizr/Dockerfile
index a199f4b3c..268e0c5eb 100644
--- a/organizr/Dockerfile
+++ b/organizr/Dockerfile
@@ -21,6 +21,7 @@ FROM ${BUILD_FROM}
 # 2 Modify Image #
 ##################
 
+# hadolint ignore=DL4006
 RUN \
     ########################################
     # Correct upstream image folders links #
diff --git a/paperless_ng/Dockerfile b/paperless_ng/Dockerfile
index d14213545..1f50fe820 100644
--- a/paperless_ng/Dockerfile
+++ b/paperless_ng/Dockerfile
@@ -23,6 +23,7 @@ FROM ${BUILD_FROM}
 ##################
 
 ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng
+# hadolint ignore=SC2015
 RUN \
     #################
     # Correct image #
diff --git a/plex/Dockerfile b/plex/Dockerfile
index 4a824bb62..dfc463cd7 100644
--- a/plex/Dockerfile
+++ b/plex/Dockerfile
@@ -25,6 +25,7 @@ FROM ${BUILD_FROM}
 # Set shell
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
+# hadolint ignore=SC2016
 RUN \
     #############################
     # Allow UID and GID setting #
diff --git a/portainer/Dockerfile b/portainer/Dockerfile
index 2aba81a83..c02bbcab0 100644
--- a/portainer/Dockerfile
+++ b/portainer/Dockerfile
@@ -27,6 +27,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # Setup base
 ARG BUILD_UPSTREAM="2.11.0"
 
+# hadolint ignore=SC2015
 RUN \
     BUILD_ARCH=$(uname -m) \
     && echo "${BUILD_ARCH}" \
diff --git a/resiliosync/Dockerfile b/resiliosync/Dockerfile
index 205cb1f20..ecc4619fe 100644
--- a/resiliosync/Dockerfile
+++ b/resiliosync/Dockerfile
@@ -23,6 +23,7 @@ FROM ${BUILD_FROM}
 # 2 Modify Image #
 ##################
 
+# hadolint ignore=DL4006
 RUN \
     ###############
     # Adapt image #
diff --git a/scrutiny/Dockerfile b/scrutiny/Dockerfile
index eba40f142..7c8adc1f0 100644
--- a/scrutiny/Dockerfile
+++ b/scrutiny/Dockerfile
@@ -22,6 +22,7 @@ FROM ${BUILD_FROM}
 # 2 Modify Image #
 ##################
 
+# hadolint ignore=DL4006
 RUN \
     # Allow UID and GID setting
     sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
diff --git a/webtop/Dockerfile b/webtop/Dockerfile
index 54063c5af..f1412c284 100644
--- a/webtop/Dockerfile
+++ b/webtop/Dockerfile
@@ -33,7 +33,8 @@ RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
     && usermod --home /share/webtop abc
 
 # Graphic drivers for rpi4
-RUN apt-get update && apt-get dist-upgrade && apt-get install -yqq libgles2-mesa libgles2-mesa-dev xorg-dev || true
+# hadolint ignore=SC2015
+RUN apt-get update && apt-get install -yqq --no-install-recommends libgles2-mesa libgles2-mesa-dev xorg-dev || true
 
 ##################
 # 3 Install apps #
diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
index 27c16a4f3..b215d0551 100644
--- a/webtrees/Dockerfile
+++ b/webtrees/Dockerfile
@@ -25,6 +25,7 @@ FROM nathanvaughn/webtrees:$BUILD_UPSTREAM
 # Global variables
 ENV WEBTREES_HOME="/data/webtrees"
 WORKDIR $WEBTREES_HOME
+# hadolint ignore=DL4006
 RUN \
     # Change data location
     grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g' \