mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-23 09:11:50 +02:00
Update Dockerfile
This commit is contained in:
@@ -2,35 +2,35 @@ ARG BUILD_FROM
|
|||||||
ARG BUILD_VERSION
|
ARG BUILD_VERSION
|
||||||
FROM florider89/joplin-server:master
|
FROM florider89/joplin-server:master
|
||||||
|
|
||||||
# Copy root filesystem
|
ARG BASHIO_VERSION=0.13.1
|
||||||
ARG user=joplin
|
USER root
|
||||||
USER $user
|
|
||||||
COPY --chown=$user:$user rootfs /
|
|
||||||
|
|
||||||
#ARG BASHIO_VERSION=0.13.1
|
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
################
|
################
|
||||||
# Install apps #
|
# Install apps #
|
||||||
################
|
################
|
||||||
npm install jq \
|
apt-get clean \
|
||||||
|
&& apt-get update \
|
||||||
|
&& apt-get install -y \
|
||||||
|
jq \
|
||||||
|
curl \
|
||||||
\
|
\
|
||||||
###################
|
|
||||||
# Configure image #
|
|
||||||
###################
|
|
||||||
# Allow execution of run
|
|
||||||
&& chmod +x /run.sh
|
|
||||||
#
|
|
||||||
##################
|
##################
|
||||||
# Install bashio #
|
# Install bashio #
|
||||||
##################
|
##################
|
||||||
#&& 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
|
||||||
#\
|
###################
|
||||||
|
# Configure image #
|
||||||
|
###################
|
||||||
|
|
||||||
|
# Copy root filesystem
|
||||||
|
USER joplin
|
||||||
|
COPY --chown=$user:$user rootfs /
|
||||||
|
RUN chmod +x /run.sh
|
||||||
|
|
||||||
#ENTRYPOINT [ "/usr/bin/env" ]
|
#ENTRYPOINT [ "/usr/bin/env" ]
|
||||||
CMD [ "/run.sh" ]
|
CMD [ "/run.sh" ]
|
||||||
|
|||||||
Reference in New Issue
Block a user