mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-06-12 02:21:28 +02:00
add yq
This commit is contained in:
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
@@ -18,6 +19,7 @@ RUN \
|
|||||||
smbclient \
|
smbclient \
|
||||||
|| apk add --no-cache \
|
|| apk add --no-cache \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
@@ -27,9 +28,9 @@ RUN \
|
|||||||
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
||||||
&& rm -rf /tmp/bashio
|
&& rm -rf /tmp/bashio
|
||||||
|
|
||||||
#################
|
#################
|
||||||
# Correct image #
|
# Correct image #
|
||||||
#################
|
#################
|
||||||
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 \
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
samba \
|
samba \
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
samba \
|
samba \
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
samba \
|
samba \
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
|
|||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
##################
|
##################
|
||||||
# Install bashio #
|
# Install bashio #
|
||||||
##################
|
##################
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
|
|||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
samba \
|
samba \
|
||||||
smbclient \
|
smbclient \
|
||||||
##################
|
##################
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
samba \
|
samba \
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
yamllint \
|
yamllint \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -yq --no-install-recommends \
|
apt-get install -yq --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
yamllint
|
yamllint
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
yamllint \
|
yamllint \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
|||||||
@@ -10,8 +10,9 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
################
|
################
|
||||||
apt-get clean &&
|
apt-get clean &&
|
||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -yq --no-install-recommends \
|
apt-get install --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
yamllint
|
yamllint
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ RUN \
|
|||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
bash \
|
bash \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
bash \
|
bash \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ RUN \
|
|||||||
##################
|
##################
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
\
|
\
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
yamllint \
|
yamllint \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
yamllint
|
yamllint
|
||||||
|
|
||||||
|
|||||||
@@ -11,12 +11,14 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
samba \
|
samba \
|
||||||
smbclient || apk add --no-cache \
|
smbclient || apk add --no-cache \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -14,10 +14,11 @@ RUN \
|
|||||||
# Install apps #
|
# Install apps #
|
||||||
################
|
################
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
jq \
|
jq \
|
||||||
bash \
|
yq \
|
||||||
xz build-base libressl-dev ca-certificates npm \
|
bash \
|
||||||
|
xz build-base libressl-dev ca-certificates npm \
|
||||||
\
|
\
|
||||||
##################
|
##################
|
||||||
# Install bashio #
|
# Install bashio #
|
||||||
@@ -33,9 +34,9 @@ RUN \
|
|||||||
# Install mustache #
|
# Install mustache #
|
||||||
####################
|
####################
|
||||||
&& apk add --no-cache \
|
&& apk add --no-cache \
|
||||||
go \
|
go \
|
||||||
npm \
|
npm \
|
||||||
# && npm install mustache-cli --global
|
# && npm install mustache-cli --global
|
||||||
&& apk upgrade --no-cache &&\
|
&& apk upgrade --no-cache &&\
|
||||||
apk add --no-cache --virtual .build-deps\
|
apk add --no-cache --virtual .build-deps\
|
||||||
build-base\
|
build-base\
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ RUN apt-get update \
|
|||||||
\
|
\
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
samba \
|
samba \
|
||||||
smbclient \
|
smbclient \
|
||||||
\
|
\
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ RUN apt-get update \
|
|||||||
\
|
\
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
samba \
|
samba \
|
||||||
smbclient \
|
smbclient \
|
||||||
nginx \
|
nginx \
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
samba \
|
samba \
|
||||||
smbclient \
|
smbclient \
|
||||||
nginx
|
nginx
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ RUN \
|
|||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
wget \
|
wget \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
nginx \
|
nginx \
|
||||||
##################
|
##################
|
||||||
# Install bashio #
|
# Install bashio #
|
||||||
|
|||||||
@@ -11,9 +11,10 @@ RUN \
|
|||||||
apt-get clean \
|
apt-get clean \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
curl \
|
yq \
|
||||||
# nginx \
|
curl \
|
||||||
|
# nginx \
|
||||||
\
|
\
|
||||||
##################
|
##################
|
||||||
# Install bashio #
|
# Install bashio #
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apk update &&
|
apk update &&
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
@@ -19,6 +20,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
# Backup if change
|
# Backup if change
|
||||||
|| apk add --no-cache jq curl \
|
|| apk add --no-cache jq curl \
|
||||||
|
|||||||
@@ -4,37 +4,38 @@ FROM ${BUILD_FROM}
|
|||||||
ARG BASHIO_VERSION=0.13.1
|
ARG BASHIO_VERSION=0.13.1
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
################
|
################
|
||||||
# Install apps #
|
# Install apps #
|
||||||
################
|
################
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
jq \
|
jq \
|
||||||
\
|
yq \
|
||||||
###################
|
\
|
||||||
# Install bashio #
|
###################
|
||||||
##################
|
# Install bashio #
|
||||||
&& mkdir -p /tmp/bashio \
|
##################
|
||||||
&& curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
|
&& mkdir -p /tmp/bashio \
|
||||||
| tar -xzf - --strip 1 -C /tmp/bashio \
|
&& curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
|
||||||
&& mv /tmp/bashio/lib /usr/lib/bashio \
|
| tar -xzf - --strip 1 -C /tmp/bashio \
|
||||||
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
&& mv /tmp/bashio/lib /usr/lib/bashio \
|
||||||
&& rm -rf /tmp/bashio \
|
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
||||||
\
|
&& rm -rf /tmp/bashio \
|
||||||
########################################
|
\
|
||||||
# Correct upstream image folders links #
|
########################################
|
||||||
########################################
|
# Correct upstream image folders links #
|
||||||
\
|
########################################
|
||||||
# Allow UID and GID setting
|
\
|
||||||
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
# Allow UID and GID setting
|
||||||
&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
|
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
|
||||||
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/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' \
|
# Allow custom config folder
|
||||||
&& grep -rl '/config' /etc/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
|
&& grep -rl '/config' /defaults/ | 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/cont-init.d/ | xargs sed -i 's|/config|/data/organizr|g' \
|
||||||
&& grep -rl '/config' /etc/services.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 local files
|
||||||
COPY root/ /
|
COPY root/ /
|
||||||
@@ -48,20 +49,20 @@ ARG BUILD_REF
|
|||||||
ARG BUILD_REPOSITORY
|
ARG BUILD_REPOSITORY
|
||||||
ARG BUILD_VERSION
|
ARG BUILD_VERSION
|
||||||
LABEL \
|
LABEL \
|
||||||
io.hass.name="${BUILD_NAME}" \
|
io.hass.name="${BUILD_NAME}" \
|
||||||
io.hass.description="${BUILD_DESCRIPTION}" \
|
io.hass.description="${BUILD_DESCRIPTION}" \
|
||||||
io.hass.arch="${BUILD_ARCH}" \
|
io.hass.arch="${BUILD_ARCH}" \
|
||||||
io.hass.type="addon" \
|
io.hass.type="addon" \
|
||||||
io.hass.version=${BUILD_VERSION} \
|
io.hass.version=${BUILD_VERSION} \
|
||||||
maintainer="alexbelgium (https://github.com/alexbelgium)" \
|
maintainer="alexbelgium (https://github.com/alexbelgium)" \
|
||||||
org.opencontainers.image.title="${BUILD_NAME}" \
|
org.opencontainers.image.title="${BUILD_NAME}" \
|
||||||
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
|
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
|
||||||
org.opencontainers.image.vendor="Home Assistant Add-ons" \
|
org.opencontainers.image.vendor="Home Assistant Add-ons" \
|
||||||
org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
|
org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
|
||||||
org.opencontainers.image.licenses="MIT" \
|
org.opencontainers.image.licenses="MIT" \
|
||||||
org.opencontainers.image.url="https://github.com/alexbelgium" \
|
org.opencontainers.image.url="https://github.com/alexbelgium" \
|
||||||
org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
|
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.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
|
||||||
org.opencontainers.image.created=${BUILD_DATE} \
|
org.opencontainers.image.created=${BUILD_DATE} \
|
||||||
org.opencontainers.image.revision=${BUILD_REF} \
|
org.opencontainers.image.revision=${BUILD_REF} \
|
||||||
org.opencontainers.image.version=${BUILD_VERSION}
|
org.opencontainers.image.version=${BUILD_VERSION}
|
||||||
|
|||||||
@@ -8,16 +8,17 @@ ENV PAPERLESS_DATA_DIR=/config/paperless_ng
|
|||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
\
|
\
|
||||||
apt-get clean && \
|
apt-get clean && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
curl \
|
yq \
|
||||||
cifs-utils \
|
curl \
|
||||||
keyutils \
|
cifs-utils \
|
||||||
smbclient \
|
keyutils \
|
||||||
samba \
|
smbclient \
|
||||||
yamllint \
|
samba \
|
||||||
|
yamllint \
|
||||||
\
|
\
|
||||||
##################
|
##################
|
||||||
# Install bashio #
|
# Install bashio #
|
||||||
|
|||||||
@@ -6,18 +6,18 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
################
|
################
|
||||||
# Install apps #
|
# Install apps #
|
||||||
################
|
################
|
||||||
|
|
||||||
apt-get clean &&
|
apt-get clean &&
|
||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
curl \
|
yq \
|
||||||
cifs-utils \
|
curl \
|
||||||
keyutils \
|
cifs-utils \
|
||||||
smbclient \
|
keyutils \
|
||||||
samba \
|
smbclient \
|
||||||
yamllint
|
samba \
|
||||||
|
yamllint
|
||||||
|
|
||||||
###################
|
###################
|
||||||
# Install bashio #
|
# Install bashio #
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update &&
|
apt-get update &&
|
||||||
apt-get install -y --no-install-recommends \
|
apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
@@ -18,6 +19,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apk update &&
|
apk update &&
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ RUN \
|
|||||||
# Install bashio
|
# Install bashio
|
||||||
apk add --no-cache \
|
apk add --no-cache \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
\
|
\
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
samba \
|
samba \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update \
|
apt-get update \
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -11,19 +11,20 @@ ARG TEMPIO_VERSION=2021.01.0
|
|||||||
ARG BUILD_ARCH
|
ARG BUILD_ARCH
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
# Install script
|
# Install script
|
||||||
chmod a+x /run.sh \
|
chmod a+x /run.sh \
|
||||||
\
|
\
|
||||||
# Add apps
|
# Add apps
|
||||||
&& apk add --no-cache \
|
&& apk add --no-cache \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
nginx \
|
nginx \
|
||||||
\
|
\
|
||||||
# Install tempio
|
# Install tempio
|
||||||
&& curl -L -f -s -o /usr/bin/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 \
|
&& chmod a+x /usr/bin/tempio \
|
||||||
\
|
\
|
||||||
##################
|
##################
|
||||||
@@ -36,22 +37,22 @@ RUN \
|
|||||||
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
||||||
&& rm -rf /tmp/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/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/{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 \
|
&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser \
|
||||||
# Correct visualization bug on mobile
|
# 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 \
|
# && 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
|
# use /data instead of /config for database
|
||||||
&& sed -i 's| /config| /data|g' /defaults/scrutiny.yaml \
|
&& 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/cont-init.d/* \
|
||||||
&& sed -i 's| /config| /data|g' /etc/logrotate.d/scrutiny \
|
&& sed -i 's| /config| /data|g' /etc/logrotate.d/scrutiny \
|
||||||
&& sed -i 's| /config| /data|g' /etc/crontabs/root \
|
&& sed -i 's| /config| /data|g' /etc/crontabs/root \
|
||||||
# analyse local devices at reboot
|
# analyse local devices at reboot
|
||||||
# && sed -i '$d' /etc/crontabs/root \
|
# && sed -i '$d' /etc/crontabs/root \
|
||||||
# && sed -i -e '$a @reboot /run.sh' /etc/crontabs/root \
|
# && sed -i -e '$a @reboot /run.sh' /etc/crontabs/root \
|
||||||
# && sed -i -e '$a 0 * * * * /run.sh' /etc/crontabs/root \
|
# && sed -i -e '$a 0 * * * * /run.sh' /etc/crontabs/root \
|
||||||
# correct url paths
|
# correct url paths
|
||||||
&& grep -rl '/web/' /app/scrutiny-web/ | xargs sed -i 's|/web/|./|g'
|
&& grep -rl '/web/' /app/scrutiny-web/ | xargs sed -i 's|/web/|./|g'
|
||||||
|
|
||||||
VOLUME [ "/data" ]
|
VOLUME [ "/data" ]
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
cifs-utils \
|
cifs-utils \
|
||||||
keyutils \
|
keyutils \
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ ARG BASHIO_VERSION=0.13.1
|
|||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
samba \
|
samba \
|
||||||
samba-client \
|
samba-client \
|
||||||
&& curl -J -L -o /tmp/bashio.tar.gz \
|
&& 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/images /transmission-web-control && \
|
||||||
ln -s /usr/share/transmission/web/javascript /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
|
ln -s /usr/share/transmission/web/index.html /transmission-web-control/index.original.html
|
||||||
|
|
||||||
|
|
||||||
# Copy root filesystem
|
# Copy root filesystem
|
||||||
COPY rootfs /
|
COPY rootfs /
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ ARG BASHIO_VERSION=0.13.1
|
|||||||
RUN apk add --no-cache \
|
RUN apk add --no-cache \
|
||||||
curl \
|
curl \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
moreutils \
|
moreutils \
|
||||||
samba \
|
samba \
|
||||||
nginx \
|
nginx \
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ RUN \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
|
yq \
|
||||||
curl \
|
curl \
|
||||||
yamllint \
|
yamllint \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
|||||||
apt-get update
|
apt-get update
|
||||||
apt-get install -y \
|
apt-get install -y \
|
||||||
jq \
|
jq \
|
||||||
yamllint \
|
yq \
|
||||||
|
yamllint \
|
||||||
curl &&
|
curl &&
|
||||||
apt-get clean
|
apt-get clean
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user