Fix #603 and remove mysql from sqlite image

This changes the healthcheck to use `sh` instead of bash, that is absent
from some image versions. (like alpine)

It also removes `*mariadb*` packages from runtime image of sqlite images
as these shouldn't be required.
This commit is contained in:
Miro Prasil 2019-09-06 09:34:21 +01:00
parent df8114f8be
commit eea3f13bb3
10 changed files with 20 additions and 15 deletions

View File

@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \
libmariadbclient-dev \ libmariadbclient-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -99,7 +100,7 @@ COPY --from=build /app/target/aarch64-unknown-linux-gnu/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -81,7 +81,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
libmariadbclient-dev \ curl \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data
@ -99,7 +99,7 @@ COPY --from=build /app/target/aarch64-unknown-linux-gnu/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -80,6 +80,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \
libmariadbclient-dev \ libmariadbclient-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -96,7 +97,7 @@ COPY --from=build app/target/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -63,6 +63,7 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
RUN apk add --no-cache \ RUN apk add --no-cache \
openssl \ openssl \
mariadb-connector-c \ mariadb-connector-c \
curl \
ca-certificates ca-certificates
RUN mkdir /data RUN mkdir /data
@ -78,7 +79,7 @@ COPY --from=build /app/target/x86_64-unknown-linux-musl/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -80,7 +80,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
libmariadbclient-dev \ curl \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data
@ -96,7 +96,7 @@ COPY --from=build app/target/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -62,7 +62,7 @@ ENV SSL_CERT_DIR=/etc/ssl/certs
# Install needed libraries # Install needed libraries
RUN apk add --no-cache \ RUN apk add --no-cache \
openssl \ openssl \
mariadb-connector-c \ curl \
ca-certificates ca-certificates
RUN mkdir /data RUN mkdir /data
@ -78,7 +78,7 @@ COPY --from=build /app/target/x86_64-unknown-linux-musl/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!

View File

@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \
libmariadbclient-dev \ libmariadbclient-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -99,7 +100,7 @@ COPY --from=build /app/target/arm-unknown-linux-gnueabi/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -81,7 +81,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
libmariadbclient-dev \ curl \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data
@ -99,7 +99,7 @@ COPY --from=build /app/target/arm-unknown-linux-gnueabi/release/bitwarden_rs .
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
curl \
libmariadbclient-dev \ libmariadbclient-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
@ -100,7 +101,7 @@ COPY --from=build /app/target/armv7-unknown-linux-gnueabihf/release/bitwarden_rs
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]

View File

@ -81,7 +81,7 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
openssl \ openssl \
ca-certificates \ ca-certificates \
libmariadbclient-dev \ curl \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN mkdir /data RUN mkdir /data
@ -99,7 +99,7 @@ COPY --from=build /app/target/armv7-unknown-linux-gnueabihf/release/bitwarden_rs
COPY docker/healthcheck.sh ./healthcheck.sh COPY docker/healthcheck.sh ./healthcheck.sh
HEALTHCHECK --interval=10s --timeout=1s CMD bash healthcheck.sh || exit 1 HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1
# Configures the startup! # Configures the startup!
CMD ["./bitwarden_rs"] CMD ["./bitwarden_rs"]