Update Dockerfile

This commit is contained in:
Alexandre
2021-10-21 21:25:56 +02:00
committed by GitHub
parent 8dfb52f56a
commit d5802403bc

View File

@@ -1,7 +1,22 @@
ARG BUILD_VERSION ARG BUILD_VERSION
FROM nathanvaughn/webtrees:latest FROM nathanvaughn/webtrees:latest
ARG BASHIO_VERSION=0.13.1
RUN \ 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 # 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| /data/options|g' /docker-entrypoint.sh && sed -i 's|_FILE" 2> /dev/null| /data/options|g' /docker-entrypoint.sh
@@ -11,33 +26,23 @@ RUN \
#USER root #USER root
# Base system # Base system
#ARG BASHIO_VERSION=0.13.1
#ARG TEMPIO_VERSION=2021.01.0
#ARG BUILD_ARCH #ARG BUILD_ARCH
# Copy root filesystem # Copy root filesystem
#COPY rootfs / #COPY rootfs /
#RUN \ #RUN \
# ################
# # Install apps # ##################
# ################ # Install bashio #
# apt-get clean \ ##################
# && apt-get update \ mkdir -p /tmp/bashio \
# && apt-get install -y \ && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
# jq \ | tar -xzf - --strip 1 -C /tmp/bashio \
# curl \ && mv /tmp/bashio/lib /usr/lib/bashio \
# && apt-get clean \ && 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 #RUN chmod a+x /docker-entrypoint.sh
################ ################