CRLF to LF

This commit is contained in:
Alexandre
2021-01-18 10:05:04 +01:00
parent cd1d735c83
commit 087af60a0c
3 changed files with 15 additions and 15 deletions

View File

@@ -6,7 +6,7 @@ ARG BITWARDEN_ARCH
ARG BUILD_VERSION ARG BUILD_VERSION
# hadolint ignore=DL3006 # hadolint ignore=DL3006
FROM "bitwardenrs/server:1.18.0${BITWARDEN_ARCH}" as bitwarden FROM "bitwardenrs/server:${BUILD_VERSION}${BITWARDEN_ARCH}" as bitwarden
############################################################################### ###############################################################################
# Build the actual add-on. # Build the actual add-on.
@@ -28,10 +28,10 @@ RUN \
apt-get update \ apt-get update \
\ \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
nginx=1.14.2-2+deb10u3 libpq5 libmariadb3 \ nginx=1.14.2-2+deb10u3 libpq5 libmariadb3 \
&& apt-get clean \ && apt-get clean \
&& rm -f -r \ && rm -f -r \
/etc/nginx \ /etc/nginx \
\ \
&& mkdir -p /var/log/nginx \ && mkdir -p /var/log/nginx \
&& touch /var/log/nginx/error.log && touch /var/log/nginx/error.log

View File

@@ -5,13 +5,13 @@ FROM $BUILD_FROM
#Install bashio #Install bashio
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
jq \ jq \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \ --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
@@ -19,15 +19,15 @@ RUN apt-get update \
#Install Joal #Install Joal
RUN mkdir -p /joal \ RUN mkdir -p /joal \
&& curl -L -s \ && curl -L -s \
"https://github.com/anthonyraymond/joal/releases/download/${BUILD_VERSION}/joal.tar.gz" \ "https://github.com/anthonyraymond/joal/releases/download/${BUILD_VERSION}/joal.tar.gz" \
| tar zxvf - -C /joal \ | tar zxvf - -C /joal \
&& chown -R $(id -u):$(id -g) /joal && chown -R $(id -u):$(id -g) /joal
#Clean #Clean
RUN rm -fr \ RUN rm -fr \
/tmp/* \ /tmp/* \
/var/{cache,log}/* \ /var/{cache,log}/* \
/var/lib/apt/lists/* /var/lib/apt/lists/*
COPY run.sh / COPY run.sh /
RUN chmod 777 /run.sh RUN chmod 777 /run.sh

View File

@@ -8,11 +8,11 @@ RUN apk add --no-cache \
curl \ curl \
jq \ jq \
&& curl -J -L -o /tmp/bashio.tar.gz \ && curl -J -L -o /tmp/bashio.tar.gz \
"https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \
&& mkdir /tmp/bashio \ && mkdir /tmp/bashio \
&& tar zxvf \ && tar zxvf \
/tmp/bashio.tar.gz \ /tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \ --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