Update Dockerfile

This commit is contained in:
Alexandre
2021-08-28 07:55:43 +02:00
committed by GitHub
parent ba9293094f
commit 4cd4b0b4a8

View File

@@ -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" ]