diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile index 4243c2f48..d8a0467e5 100644 --- a/webtrees/Dockerfile +++ b/webtrees/Dockerfile @@ -1,7 +1,22 @@ ARG BUILD_VERSION FROM nathanvaughn/webtrees:latest +ARG BASHIO_VERSION=0.13.1 + RUN \ + ################ + # Install apps # + ################ + apt-get clean \ + && apt-get update \ + && apt-get install -y \ + jq \ + curl \ + && apt-get clean \ + \ + ################ + # Modify image # + ################ # Use data from addon options for all values sed -i 's|cat \"\$|jq .|g' /docker-entrypoint.sh \ && sed -i 's|_FILE" 2> /dev/null| /data/options|g' /docker-entrypoint.sh @@ -11,33 +26,23 @@ RUN \ #USER root # Base system -#ARG BASHIO_VERSION=0.13.1 -#ARG TEMPIO_VERSION=2021.01.0 + #ARG BUILD_ARCH # Copy root filesystem #COPY rootfs / #RUN \ -# ################ -# # Install apps # -# ################ -# apt-get clean \ -# && apt-get update \ -# && apt-get install -y \ -# jq \ -# curl \ -# && apt-get clean \ -# \ -# ################## -# # 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 + + ################## + # 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 #RUN chmod a+x /docker-entrypoint.sh ################