avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-10 09:35:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Dockerfile

Browse Source
This commit is contained in:
Alexandre
2021-10-21 21:35:41 +02:00
committed by GitHub
parent f18d4743e8
commit e07cae302c
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
webtrees/Dockerfile
View File

@@ -17,25 +17,6 @@ RUN \
curl \ curl \
&& apt-get clean \ && 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.json|g' /docker-entrypoint.sh
#VOLUME [ "/data" ]
#USER root
# Base system
#ARG BUILD_ARCH
#RUN \
################## ##################
# Install bashio # # Install bashio #
################## ##################
@@ -45,7 +26,22 @@ 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 \
&& rm -rf /tmp/bashio && rm -rf /tmp/bashio
\
################
# 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.json|g' /docker-entrypoint.sh \
\
# Add initial script
&& chmod a+x /run.sh \
&& sed -i "2 i\./run.sh" /docker-entrypoint.sh
#VOLUME [ "/data" ]
#USER root
# Base system
#ARG BUILD_ARCH
#RUN chmod a+x /docker-entrypoint.sh #RUN chmod a+x /docker-entrypoint.sh
################ ################
# Modify image # # Modify image #
@@ -71,16 +67,12 @@ RUN \
#&& ln -s /data/config.ini.php /var/www/webtrees/data \ #&& ln -s /data/config.ini.php /var/www/webtrees/data \
#&& touch /data/webtrees.sqlite \ #&& touch /data/webtrees.sqlite \
#&& ln -s /data/webtrees.sqlite /var/www/webtrees/data #&& ln -s /data/webtrees.sqlite /var/www/webtrees/data
#ENV WEBTREES_HOME="/data" #ENV WEBTREES_HOME="/data"
#WORKDIR $WEBTREES_HOME #WORKDIR $WEBTREES_HOME
#ENTRYPOINT ["/run.sh"] #ENTRYPOINT ["/run.sh"]
#COPY /var/www/webtrees/.htaccess $WEBTREES_HOME #COPY /var/www/webtrees/.htaccess $WEBTREES_HOME
#RUN rm - $WEBTREES_HOMER /var/www/webtrees/data \ #RUN rm - $WEBTREES_HOMER /var/www/webtrees/data \
# && ln -s /data /var/www/webtrees # && ln -s /data /var/www/webtrees
#RUN touch /data/database.sqlite \ #RUN touch /data/database.sqlite \
# && ln -s /data/database.sqlite /var/www/webtrees/data \ # && ln -s /data/database.sqlite /var/www/webtrees/data \
# && touch /data/config.ini.php \ # && touch /data/config.ini.php \