This commit is contained in:
Alexandre
2022-01-20 21:08:38 +01:00
parent 2116a4879c
commit e09a7359c2
9 changed files with 11 additions and 1 deletions

View File

@@ -22,6 +22,8 @@ FROM ${BUILD_FROM}
# 2 Modify Image # # 2 Modify Image #
################## ##################
# hadolint ignore=DL4006
# hadolint ignore=SC2015
RUN \ RUN \
# Allow UID and GID setting # Allow UID and GID setting
sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

View File

@@ -21,6 +21,7 @@ FROM ${BUILD_FROM}
# 2 Modify Image # # 2 Modify Image #
################## ##################
# hadolint ignore=DL4006
RUN \ RUN \
######################################## ########################################
# Correct upstream image folders links # # Correct upstream image folders links #

View File

@@ -23,6 +23,7 @@ FROM ${BUILD_FROM}
################## ##################
ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng ENV PAPERLESS_DATA_DIR=/config/addons_config/paperless_ng
# hadolint ignore=SC2015
RUN \ RUN \
################# #################
# Correct image # # Correct image #

View File

@@ -25,6 +25,7 @@ FROM ${BUILD_FROM}
# Set shell # Set shell
SHELL ["/bin/bash", "-o", "pipefail", "-c"] SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=SC2016
RUN \ RUN \
############################# #############################
# Allow UID and GID setting # # Allow UID and GID setting #

View File

@@ -27,6 +27,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# Setup base # Setup base
ARG BUILD_UPSTREAM="2.11.0" ARG BUILD_UPSTREAM="2.11.0"
# hadolint ignore=SC2015
RUN \ RUN \
BUILD_ARCH=$(uname -m) \ BUILD_ARCH=$(uname -m) \
&& echo "${BUILD_ARCH}" \ && echo "${BUILD_ARCH}" \

View File

@@ -23,6 +23,7 @@ FROM ${BUILD_FROM}
# 2 Modify Image # # 2 Modify Image #
################## ##################
# hadolint ignore=DL4006
RUN \ RUN \
############### ###############
# Adapt image # # Adapt image #

View File

@@ -22,6 +22,7 @@ FROM ${BUILD_FROM}
# 2 Modify Image # # 2 Modify Image #
################## ##################
# hadolint ignore=DL4006
RUN \ RUN \
# Allow UID and GID setting # Allow UID and GID setting
sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \ sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

View File

@@ -33,7 +33,8 @@ RUN sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
&& usermod --home /share/webtop abc && usermod --home /share/webtop abc
# Graphic drivers for rpi4 # 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 # # 3 Install apps #

View File

@@ -25,6 +25,7 @@ FROM nathanvaughn/webtrees:$BUILD_UPSTREAM
# Global variables # Global variables
ENV WEBTREES_HOME="/data/webtrees" ENV WEBTREES_HOME="/data/webtrees"
WORKDIR $WEBTREES_HOME WORKDIR $WEBTREES_HOME
# hadolint ignore=DL4006
RUN \ RUN \
# Change data location # Change data location
grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g' \ grep -rl "/var/www/webtrees" /etc/ | xargs sed -i 's|/var/www/webtrees|/data/webtrees|g' \