avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-16 05:41:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Align bashio code

Browse Source
This commit is contained in:
Alexandre
2021-10-23 19:02:28 +02:00
parent fe8c59f012
commit 97499236c0
12 changed files with 61 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
doublecommander/Dockerfile
View File

@@ -1,6 +1,7 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
# Install bashio # Install bashio
RUN apt-get update \ RUN apt-get update \
@@ -8,19 +9,22 @@ RUN apt-get update \
jq \ jq \
samba \ samba \
smbclient \ smbclient \
&& curl -J -L -o /tmp/bashio.tar.gz \ ##################
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ # Install bashio #
&& mkdir /tmp/bashio \ ##################
&& tar zxvf \ && mkdir -p /tmp/bashio \
/tmp/bashio.tar.gz \ && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
--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 \
\ \
&& mv /tmp/bashio/lib /usr/lib/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
&& rm -fr \ && rm -fr \
/tmp/* \ /tmp/* \
/var/{cache,log}/* \
/var/lib/apt/lists/* \ /var/lib/apt/lists/* \
\
# 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 \

21
flexget/Dockerfile
View File

@@ -1,27 +1,32 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
FROM wiserain/flexget:latest FROM wiserain/flexget:latest
ARG BASHIO_VERSION=0.13.1
RUN \ RUN \
################## ##################
# Install bashio # # Install apps #
################## ##################
apk add --no-cache \ apk add --no-cache \
jq \ jq \
curl \ curl \
cifs-utils \ cifs-utils \
\ \
&& curl -J -L -o /tmp/bashio.tar.gz \ ##################
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ # Install bashio #
&& mkdir /tmp/bashio \ ##################
&& tar zxvf \ && mkdir -p /tmp/bashio \
/tmp/bashio.tar.gz \ && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
--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 \
\ \
&& mv /tmp/bashio/lib /usr/lib/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
&& rm -fr \ && rm -fr \
/tmp/* \ /tmp/* \
/var/lib/apt/lists/* \
\ \
############### ###############
# Adapt image # # Adapt image #
@@ -40,7 +45,7 @@ RUN \
&& sed -i 's/bash/bashio/g' /etc/cont-init.d/20-config \ && sed -i 's/bash/bashio/g' /etc/cont-init.d/20-config \
&& sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); fi/g' /etc/cont-init.d/20-config \ && sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); fi/g' /etc/cont-init.d/20-config \
&& sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); fi/g' /etc/cont-init.d/20-config && sed -i 's/# install custom plugins/if bashio::config.has_value "FG_PLUGINS"; then FG_PLUGINS=$(bashio::config "FG_PLUGINS"); fi/g' /etc/cont-init.d/20-config
VOLUME [ "/data" ] VOLUME [ "/data" ]
### LABELS ### LABELS

4
jackett/Dockerfile
View File

@@ -1,10 +1,10 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
RUN curl -J -L -o /tmp/bashio.tar.gz \ RUN curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \

11
joal/Dockerfile
View File

@@ -7,18 +7,19 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG BUILD_VERSION ARG BUILD_VERSION
ARG BUILD_UPSTREAM="2.1.26" ARG BUILD_UPSTREAM="2.1.26"
ARG BASHIO_VERSION=0.13.1
RUN \ RUN \
#Install bashio #Install bashio
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 \
wget \ wget \
jq \ jq \
nginx \ nginx \
#Install bashio #Install bashio
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
@@ -27,12 +28,12 @@ RUN \
&& mv /tmp/bashio/lib /usr/lib/bashio \ && mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
\ \
#Install Joal #Install Joal
&& wget -O /tmp/joal.tar.gz "https://github.com/anthonyraymond/joal/releases/download/$BUILD_UPSTREAM/joal.tar.gz" \ && wget -O /tmp/joal.tar.gz "https://github.com/anthonyraymond/joal/releases/download/$BUILD_UPSTREAM/joal.tar.gz" \
&& mkdir -p /data/joal \ && mkdir -p /data/joal \
&& tar zxvf /tmp/joal.tar.gz -C /data/joal \ && tar zxvf /tmp/joal.tar.gz -C /data/joal \
&& rm /data/joal/jack-of* \ && rm /data/joal/jack-of* \
#Clean #Clean
&& rm -fr \ && rm -fr \
/tmp/* \ /tmp/* \
/var/{cache,log}/* \ /var/{cache,log}/* \

5
nextcloud/Dockerfile
View File

@@ -6,6 +6,7 @@ FROM ${BUILD_FROM}
ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
ARG BUILD_ARCH ARG BUILD_ARCH
ARG BASHIO_VERSION=0.13.1
# Add bashio # Add bashio
RUN \ RUN \
@@ -15,7 +16,7 @@ RUN \
&& apk add --no-cache \ && apk add --no-cache \
curl jq \ curl jq \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
@@ -27,7 +28,7 @@ RUN \
\ \
#gclib compatibility #gclib compatibility
&& apk add --no-cache gcompat@community || true && apk add --no-cache gcompat@community || true
RUN \ RUN \
# modify/copy files # modify/copy files
sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \ sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \

3
ombi/Dockerfile
View File

@@ -1,6 +1,7 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
RUN \ RUN \
################ ################
@@ -18,7 +19,7 @@ RUN \
# Install bashio # # Install bashio #
################## ##################
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \

6
papermerge/rootfs/etc/cont-init.d/00-aaa_bashio
View File

@@ -18,10 +18,10 @@ if [ ! -f "/usr/bin/bashio" ]; then
################### ###################
# Install bashio # # Install bashio #
################## ##################
BASHIO_VERSION="0.13.1" BASHIO_VERSION=0.13.1
mkdir -p /tmp/bashio mkdir -p /tmp/bashio
curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \ 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 mv /tmp/bashio/lib /usr/lib/bashio
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

7
piwigo/Dockerfile
View File

@@ -1,6 +1,7 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
# Copy root filesystem # Copy root filesystem
COPY rootfs / COPY rootfs /
@@ -15,7 +16,7 @@ RUN \
cifs-utils \ cifs-utils \
\ \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
@@ -30,8 +31,8 @@ RUN \
&& 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
# Use subfolder in config # Use subfolder in config
# Protect files starting by config. # Protect files starting by config.
# && files=$(grep -rl '/config.' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config.|/temptemp.|g' \ # && files=$(grep -rl '/config.' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config.|/temptemp.|g' \
# && files=$(grep -rl '/config' /defaults/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \ # && files=$(grep -rl '/config' /defaults/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \
# && files=$(grep -rl '/config' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \ # && files=$(grep -rl '/config' /etc/cont-init.d/*) && echo $files | xargs sed -i 's|/config|/share/piwigo|g' \

3
resiliosync/Dockerfile
View File

@@ -1,6 +1,7 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
RUN \ RUN \
################ ################
@@ -20,7 +21,7 @@ RUN \
# Install bashio # # Install bashio #
################## ##################
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \

3
transmission/Dockerfile
View File

@@ -1,6 +1,7 @@
ARG BUILD_FROM ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
# Add bashio # Add bashio
RUN apk add --no-cache \ RUN apk add --no-cache \
@@ -9,7 +10,7 @@ RUN apk add --no-cache \
samba \ samba \
samba-client \ samba-client \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \

5
ubooquity/Dockerfile
View File

@@ -2,6 +2,7 @@ ARG BUILD_FROM
ARG BUILD_VERSION ARG BUILD_VERSION
ARG BUILD_UPSTREAM="2.1.2" ARG BUILD_UPSTREAM="2.1.2"
FROM ${BUILD_FROM} FROM ${BUILD_FROM}
ARG BASHIO_VERSION=0.13.1
# Copy root filesystem # Copy root filesystem
COPY rootfs / COPY rootfs /
@@ -11,9 +12,9 @@ RUN apk add --no-cache \
curl \ curl \
jq \ jq \
moreutils \ moreutils \
samba \ samba \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \

19
webtrees/Dockerfile
View File

@@ -10,6 +10,7 @@ ENV WEBTREES_HOME="/data/webtrees"
WORKDIR $WEBTREES_HOME WORKDIR $WEBTREES_HOME
ENTRYPOINT ["/start.sh"] ENTRYPOINT ["/start.sh"]
VOLUME ["/data"] VOLUME ["/data"]
ARG BASHIO_VERSION=0.13.1
RUN \ RUN \
################ ################
@@ -18,8 +19,8 @@ RUN \
apt-get clean \ apt-get clean \
&& apt-get update \ && apt-get update \
&& apt-get install -y \ && apt-get install -y \
jq \ jq \
curl \ curl \
&& apt-get clean \ && apt-get clean \
\ \
################## ##################
@@ -44,18 +45,18 @@ RUN \
# Add end script # Add end script
&& sed -i '$ d' /docker-entrypoint.sh && sed -i '$ d' /docker-entrypoint.sh
# Change data location # Change data location
# && cp -rn /var/www/webtrees /data \ # && cp -rn /var/www/webtrees /data \
# && mkdir -p /data/webtrees \ # && mkdir -p /data/webtrees \
# && chown -R www-data:www-data /data/webtrees \ # && chown -R www-data:www-data /data/webtrees \
# Use data from addon options for all values # Use data from addon options for all values
#&& sed -i 's|cat \"\$|jq ."|g' /docker-entrypoint.sh \ #&& sed -i 's|cat \"\$|jq ."|g' /docker-entrypoint.sh \
#&& sed -i 's|_FILE" 2> /dev/null| //empty" /data/options.json|g' /docker-entrypoint.sh \ #&& sed -i 's|_FILE" 2> /dev/null| //empty" /data/options.json|g' /docker-entrypoint.sh \
#&& chown root:root /end.sh \ #&& chown root:root /end.sh \
#&& chmod a+x /end.sh \ #&& chmod a+x /end.sh \
#&& sed -i "2 i\cd / && ./start.sh" /docker-entrypoint.sh \ #&& sed -i "2 i\cd / && ./start.sh" /docker-entrypoint.sh \
#&& sed -i '$ i\export DB_NAME=$DB_NAME && export WT_USER=$WT_USER && export WT_PASS=$WT_PASS && cd / && ./end.sh' /docker-entrypoint.sh #&& sed -i '$ i\export DB_NAME=$DB_NAME && export WT_USER=$WT_USER && export WT_PASS=$WT_PASS && cd / && ./end.sh' /docker-entrypoint.sh
### LABELS ### LABELS
ARG BUILD_ARCH ARG BUILD_ARCH
ARG BUILD_DATE ARG BUILD_DATE