mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-07-08 06:50:58 +02:00
Align bashio code
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
FROM ${BUILD_FROM}
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
# Install bashio
|
||||
RUN apt-get update \
|
||||
@@ -8,19 +9,22 @@ RUN apt-get update \
|
||||
jq \
|
||||
samba \
|
||||
smbclient \
|
||||
&& curl -J -L -o /tmp/bashio.tar.gz \
|
||||
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
|
||||
&& mkdir /tmp/bashio \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
--strip 1 -C /tmp/bashio \
|
||||
##################
|
||||
# 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 \
|
||||
\
|
||||
&& mv /tmp/bashio/lib /usr/lib/bashio \
|
||||
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
||||
&& rm -fr \
|
||||
/tmp/* \
|
||||
/var/{cache,log}/* \
|
||||
/var/lib/apt/lists/* \
|
||||
\
|
||||
# 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 \
|
||||
|
||||
@@ -1,27 +1,32 @@
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
FROM wiserain/flexget:latest
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
RUN \
|
||||
##################
|
||||
# Install bashio #
|
||||
# Install apps #
|
||||
##################
|
||||
apk add --no-cache \
|
||||
jq \
|
||||
curl \
|
||||
cifs-utils \
|
||||
\
|
||||
&& curl -J -L -o /tmp/bashio.tar.gz \
|
||||
"https://github.com/hassio-addons/bashio/archive/v0.13.1.tar.gz" \
|
||||
&& mkdir /tmp/bashio \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
--strip 1 -C /tmp/bashio \
|
||||
##################
|
||||
# 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 \
|
||||
\
|
||||
&& mv /tmp/bashio/lib /usr/lib/bashio \
|
||||
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
|
||||
&& rm -fr \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
\
|
||||
###############
|
||||
# Adapt image #
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
FROM ${BUILD_FROM}
|
||||
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -7,6 +7,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
|
||||
ARG BUILD_VERSION
|
||||
ARG BUILD_UPSTREAM="2.1.26"
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
RUN \
|
||||
#Install bashio
|
||||
@@ -18,7 +19,7 @@ RUN \
|
||||
nginx \
|
||||
#Install bashio
|
||||
&& 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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -6,6 +6,7 @@ FROM ${BUILD_FROM}
|
||||
|
||||
ENV NEXTCLOUD_PATH="/data/config/www/nextcloud"
|
||||
ARG BUILD_ARCH
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
# Add bashio
|
||||
RUN \
|
||||
@@ -15,7 +16,7 @@ RUN \
|
||||
&& apk add --no-cache \
|
||||
curl jq \
|
||||
&& 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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
FROM ${BUILD_FROM}
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
RUN \
|
||||
################
|
||||
@@ -18,7 +19,7 @@ RUN \
|
||||
# Install bashio #
|
||||
##################
|
||||
&& 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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -18,10 +18,10 @@ if [ ! -f "/usr/bin/bashio" ]; then
|
||||
###################
|
||||
# Install bashio #
|
||||
##################
|
||||
BASHIO_VERSION="0.13.1"
|
||||
BASHIO_VERSION=0.13.1
|
||||
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
|
||||
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
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
FROM ${BUILD_FROM}
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
# Copy root filesystem
|
||||
COPY rootfs /
|
||||
@@ -15,7 +16,7 @@ RUN \
|
||||
cifs-utils \
|
||||
\
|
||||
&& 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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
FROM ${BUILD_FROM}
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
RUN \
|
||||
################
|
||||
@@ -20,7 +21,7 @@ RUN \
|
||||
# Install bashio #
|
||||
##################
|
||||
&& 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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
FROM ${BUILD_FROM}
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
# Add bashio
|
||||
RUN apk add --no-cache \
|
||||
@@ -9,7 +10,7 @@ RUN apk add --no-cache \
|
||||
samba \
|
||||
samba-client \
|
||||
&& 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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -2,6 +2,7 @@ ARG BUILD_FROM
|
||||
ARG BUILD_VERSION
|
||||
ARG BUILD_UPSTREAM="2.1.2"
|
||||
FROM ${BUILD_FROM}
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
# Copy root filesystem
|
||||
COPY rootfs /
|
||||
@@ -13,7 +14,7 @@ RUN apk add --no-cache \
|
||||
moreutils \
|
||||
samba \
|
||||
&& 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 \
|
||||
&& tar zxvf \
|
||||
/tmp/bashio.tar.gz \
|
||||
|
||||
@@ -10,6 +10,7 @@ ENV WEBTREES_HOME="/data/webtrees"
|
||||
WORKDIR $WEBTREES_HOME
|
||||
ENTRYPOINT ["/start.sh"]
|
||||
VOLUME ["/data"]
|
||||
ARG BASHIO_VERSION=0.13.1
|
||||
|
||||
RUN \
|
||||
################
|
||||
|
||||
Reference in New Issue
Block a user