This commit is contained in:
Alexandre
2021-12-01 22:07:13 +01:00
parent 6aa490e8bd
commit 3280733006
48 changed files with 150 additions and 99 deletions

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \
@@ -18,6 +19,7 @@ RUN \
smbclient \
|| apk add --no-cache \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \
@@ -27,9 +28,9 @@ RUN \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
&& rm -rf /tmp/bashio
#################
# Correct image #
#################
#################
# Correct image #
#################
RUN \
# Allow UID and GID setting
sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \

View File

@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update
apt-get install -y --no-install-recommends \
jq \
yq \
cifs-utils \
keyutils \
samba \

View File

@@ -10,6 +10,7 @@ RUN \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
cifs-utils \
keyutils \
samba \

View File

@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update &&
apt-get install -y --no-install-recommends \
jq \
yq \
cifs-utils \
keyutils \
samba \

View File

@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
##################
# Install bashio #
##################

View File

@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
samba \
smbclient \
##################

View File

@@ -15,6 +15,7 @@ RUN \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
cifs-utils \
keyutils \
samba \

View File

@@ -16,6 +16,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
yamllint \
&& apt-get clean \

View File

@@ -12,6 +12,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update
apt-get install -yq --no-install-recommends \
jq \
yq \
curl \
yamllint

View File

@@ -16,6 +16,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
yamllint \
&& apt-get clean \

View File

@@ -10,8 +10,9 @@ if [ ! -f "/usr/bin/bashio" ]; then
################
apt-get clean &&
apt-get update &&
apt-get install -yq --no-install-recommends \
apt-get install --no-install-recommends \
jq \
yq \
curl \
yamllint

View File

@@ -10,6 +10,7 @@ RUN \
apk add --no-cache \
curl \
jq \
yq \
bash \
cifs-utils \
keyutils \

View File

@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apk add --no-cache \
curl \
jq \
yq \
bash \
cifs-utils \
keyutils \

View File

@@ -9,6 +9,7 @@ RUN \
##################
apk add --no-cache \
jq \
yq \
curl \
cifs-utils \
\

View File

@@ -15,6 +15,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
yamllint \
&& apt-get clean \

View File

@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update &&
apt-get install -y --no-install-recommends \
jq \
yq \
curl \
yamllint

View File

@@ -11,12 +11,14 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \
samba \
smbclient || apk add --no-cache \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -14,10 +14,11 @@ RUN \
# Install apps #
################
apk add --no-cache \
curl \
jq \
bash \
xz build-base libressl-dev ca-certificates npm \
curl \
jq \
yq \
bash \
xz build-base libressl-dev ca-certificates npm \
\
##################
# Install bashio #
@@ -33,9 +34,9 @@ RUN \
# Install mustache #
####################
&& apk add --no-cache \
go \
npm \
# && npm install mustache-cli --global
go \
npm \
# && npm install mustache-cli --global
&& apk upgrade --no-cache &&\
apk add --no-cache --virtual .build-deps\
build-base\

View File

@@ -10,6 +10,7 @@ RUN apt-get update \
\
&& apt-get install -y --no-install-recommends \
jq \
yq \
samba \
smbclient \
\

View File

@@ -10,6 +10,7 @@ RUN apt-get update \
\
&& apt-get install -y --no-install-recommends \
jq \
yq \
samba \
smbclient \
nginx \

View File

@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update
apt-get install -y --no-install-recommends \
jq \
yq \
samba \
smbclient \
nginx

View File

@@ -16,6 +16,7 @@ RUN \
&& apt-get install -y --no-install-recommends \
wget \
jq \
yq \
nginx \
##################
# Install bashio #

View File

@@ -11,9 +11,10 @@ RUN \
apt-get clean \
&& apt-get update \
&& apt-get install -y \
jq \
curl \
# nginx \
jq \
yq \
curl \
# nginx \
\
##################
# Install bashio #

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apk update &&
apk add --no-cache \
jq \
yq \
curl \
cifs-utils \
keyutils \
@@ -19,6 +20,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update &&
apt-get install -y --no-install-recommends \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
curl \
# Backup if change
|| apk add --no-cache jq curl \

View File

@@ -4,37 +4,38 @@ FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
RUN \
################
# Install apps #
################
apk add --no-cache \
curl \
jq \
\
###################
# 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 \
&& mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
&& rm -rf /tmp/bashio \
\
########################################
# Correct upstream image folders links #
########################################
\
# 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 \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
\
# Allow custom config folder
&& grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
&& grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
&& grep -rl '/config' /etc/logrotate.d/ | xargs sed -i 's|/config|/data/organizr|g' \
&& grep -rl '/config' /etc/services.d/ | xargs sed -i 's|/config|/data/organizr|g'
################
# Install apps #
################
apk add --no-cache \
curl \
jq \
yq \
\
###################
# 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 \
&& mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
&& rm -rf /tmp/bashio \
\
########################################
# Correct upstream image folders links #
########################################
\
# 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 \
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
\
# Allow custom config folder
&& grep -rl '/config' /defaults/ | xargs sed -i 's|/config|/data/organizr|g' \
&& grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
&& grep -rl '/config' /etc/logrotate.d/ | xargs sed -i 's|/config|/data/organizr|g' \
&& grep -rl '/config' /etc/services.d/ | xargs sed -i 's|/config|/data/organizr|g'
# copy local files
COPY root/ /
@@ -48,20 +49,20 @@ ARG BUILD_REF
ARG BUILD_REPOSITORY
ARG BUILD_VERSION
LABEL \
io.hass.name="${BUILD_NAME}" \
io.hass.description="${BUILD_DESCRIPTION}" \
io.hass.arch="${BUILD_ARCH}" \
io.hass.type="addon" \
io.hass.version=${BUILD_VERSION} \
maintainer="alexbelgium (https://github.com/alexbelgium)" \
org.opencontainers.image.title="${BUILD_NAME}" \
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
org.opencontainers.image.vendor="Home Assistant Add-ons" \
org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.url="https://github.com/alexbelgium" \
org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.revision=${BUILD_REF} \
org.opencontainers.image.version=${BUILD_VERSION}
io.hass.name="${BUILD_NAME}" \
io.hass.description="${BUILD_DESCRIPTION}" \
io.hass.arch="${BUILD_ARCH}" \
io.hass.type="addon" \
io.hass.version=${BUILD_VERSION} \
maintainer="alexbelgium (https://github.com/alexbelgium)" \
org.opencontainers.image.title="${BUILD_NAME}" \
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
org.opencontainers.image.vendor="Home Assistant Add-ons" \
org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.url="https://github.com/alexbelgium" \
org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.revision=${BUILD_REF} \
org.opencontainers.image.version=${BUILD_VERSION}

View File

@@ -8,16 +8,17 @@ ENV PAPERLESS_DATA_DIR=/config/paperless_ng
RUN apt-get update && \
\
apt-get clean && \
apt-get update && \
apt-get install -y --no-install-recommends \
jq \
curl \
cifs-utils \
keyutils \
smbclient \
samba \
yamllint \
apt-get clean && \
apt-get update && \
apt-get install -y --no-install-recommends \
jq \
yq \
curl \
cifs-utils \
keyutils \
smbclient \
samba \
yamllint \
\
##################
# Install bashio #

View File

@@ -6,18 +6,18 @@ if [ ! -f "/usr/bin/bashio" ]; then
################
# Install apps #
################
apt-get clean &&
apt-get update &&
apt-get install -y --no-install-recommends \
jq \
curl \
cifs-utils \
keyutils \
smbclient \
samba \
yamllint
apt-get clean &&
apt-get update &&
apt-get install -y --no-install-recommends \
jq \
yq \
curl \
cifs-utils \
keyutils \
smbclient \
samba \
yamllint
###################
# Install bashio #

View File

@@ -13,6 +13,7 @@ RUN \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update &&
apt-get install -y --no-install-recommends \
jq \
yq \
curl \
cifs-utils \
keyutils \
@@ -18,6 +19,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apk update &&
apk add --no-cache \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -16,6 +16,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -12,6 +12,7 @@ RUN \
# Install bashio
apk add --no-cache \
jq \
yq \
curl \
cifs-utils \
\

View File

@@ -17,6 +17,7 @@ RUN \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
cifs-utils \
keyutils \
samba \

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -15,6 +15,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,6 +11,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update \
apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,6 +11,7 @@ RUN \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -11,19 +11,20 @@ ARG TEMPIO_VERSION=2021.01.0
ARG BUILD_ARCH
RUN \
# Install script
# Install script
chmod a+x /run.sh \
\
# Add apps
# Add apps
&& apk add --no-cache \
jq \
yq \
curl \
cifs-utils \
nginx \
\
# Install tempio
# Install tempio
&& curl -L -f -s -o /usr/bin/tempio \
"https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \
"https://github.com/home-assistant/tempio/releases/download/${TEMPIO_VERSION}/tempio_${BUILD_ARCH}" \
&& chmod a+x /usr/bin/tempio \
\
##################
@@ -36,22 +37,22 @@ RUN \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
&& rm -rf /tmp/bashio \
\
# 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/{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 visualization bug on mobile
# && sed -i 's|content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0"|content="width=980, initial-scale=1.0"|g' /app/scrutiny-web/index.html \
# use /data instead of /config for database
# Correct visualization bug on mobile
# && sed -i 's|content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0"|content="width=980, initial-scale=1.0"|g' /app/scrutiny-web/index.html \
# use /data instead of /config for database
&& sed -i 's| /config| /data|g' /defaults/scrutiny.yaml \
&& sed -i 's| /config| /data|g' /etc/cont-init.d/* \
&& sed -i 's| /config| /data|g' /etc/logrotate.d/scrutiny \
&& sed -i 's| /config| /data|g' /etc/crontabs/root \
# analyse local devices at reboot
# && sed -i '$d' /etc/crontabs/root \
# && sed -i -e '$a @reboot /run.sh' /etc/crontabs/root \
# && sed -i -e '$a 0 * * * * /run.sh' /etc/crontabs/root \
# correct url paths
# analyse local devices at reboot
# && sed -i '$d' /etc/crontabs/root \
# && sed -i -e '$a @reboot /run.sh' /etc/crontabs/root \
# && sed -i -e '$a 0 * * * * /run.sh' /etc/crontabs/root \
# correct url paths
&& grep -rl '/web/' /app/scrutiny-web/ | xargs sed -i 's|/web/|./|g'
VOLUME [ "/data" ]

View File

@@ -12,6 +12,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
cifs-utils \
keyutils \

View File

@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
RUN apk add --no-cache \
curl \
jq \
yq \
samba \
samba-client \
&& curl -J -L -o /tmp/bashio.tar.gz \
@@ -24,7 +25,7 @@ RUN apk add --no-cache \
ln -s /usr/share/transmission/web/images /transmission-web-control && \
ln -s /usr/share/transmission/web/javascript /transmission-web-control && \
ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html
# Copy root filesystem
COPY rootfs /

View File

@@ -8,6 +8,7 @@ ARG BASHIO_VERSION=0.13.1
RUN apk add --no-cache \
curl \
jq \
yq \
moreutils \
samba \
nginx \

View File

@@ -15,6 +15,7 @@ RUN \
&& apt-get update \
&& apt-get install -y \
jq \
yq \
curl \
yamllint \
&& apt-get clean \

View File

@@ -10,7 +10,8 @@ if [ ! -f "/usr/bin/bashio" ]; then
apt-get update
apt-get install -y \
jq \
yamllint \
yq \
yamllint \
curl &&
apt-get clean