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
# 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.
@@ -28,10 +28,10 @@ RUN \
apt-get update \
\
&& 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 \
&& rm -f -r \
/etc/nginx \
/etc/nginx \
\
&& mkdir -p /var/log/nginx \
&& touch /var/log/nginx/error.log

View File

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

View File

@@ -8,11 +8,11 @@ RUN apk add --no-cache \
curl \
jq \
&& 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 \
&& tar zxvf \
/tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \
/tmp/bashio.tar.gz \
--strip 1 -C /tmp/bashio \
\
&& mv /tmp/bashio/lib /usr/lib/bashio \
&& ln -s /usr/lib/bashio/bashio /usr/bin/bashio