diff options
| author | Daniel García <[email protected]> | 2019-09-06 10:47:10 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-09-06 10:47:10 +0200 |
| commit | c656f2f6947481748ad19e0cd7c269a6802470f7 (patch) | |
| tree | a967281b5c3b9862d73149cb00359b0cd4059b4d | |
| parent | df8114f8be631d593fc606880c6a9f5c667d399a (diff) | |
| parent | eea3f13bb3f3e92152284a7dbaa4d62bad5651ea (diff) | |
| download | vaultwarden-c656f2f6947481748ad19e0cd7c269a6802470f7.tar.gz vaultwarden-c656f2f6947481748ad19e0cd7c269a6802470f7.zip | |
Merge pull request #604 from mprasil/fix-healthcheck
Fix #603 and remove mysql from sqlite image
| -rw-r--r-- | docker/aarch64/mysql/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/aarch64/sqlite/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/amd64/mysql/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/amd64/mysql/Dockerfile.alpine | 3 | ||||
| -rw-r--r-- | docker/amd64/sqlite/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/amd64/sqlite/Dockerfile.alpine | 4 | ||||
| -rw-r--r-- | docker/armv6/mysql/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/armv6/sqlite/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/armv7/mysql/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/armv7/sqlite/Dockerfile | 4 |
10 files changed, 20 insertions, 15 deletions
diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index 9ad085fa..492086c7 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ + curl \ libmariadbclient-dev \ && 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 -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! CMD ["./bitwarden_rs"]
\ No newline at end of file diff --git a/docker/aarch64/sqlite/Dockerfile b/docker/aarch64/sqlite/Dockerfile index d9717c66..c5c331e4 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -81,7 +81,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ - libmariadbclient-dev \ + curl \ && rm -rf /var/lib/apt/lists/* 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 -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! CMD ["./bitwarden_rs"]
\ No newline at end of file diff --git a/docker/amd64/mysql/Dockerfile b/docker/amd64/mysql/Dockerfile index 66efc7a5..72b67e70 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -80,6 +80,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ + curl \ libmariadbclient-dev \ && rm -rf /var/lib/apt/lists/* @@ -96,7 +97,7 @@ COPY --from=build app/target/release/bitwarden_rs . 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! CMD ["./bitwarden_rs"]
\ No newline at end of file diff --git a/docker/amd64/mysql/Dockerfile.alpine b/docker/amd64/mysql/Dockerfile.alpine index 97c2b7e1..78589689 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -63,6 +63,7 @@ ENV SSL_CERT_DIR=/etc/ssl/certs RUN apk add --no-cache \ openssl \ mariadb-connector-c \ + curl \ ca-certificates 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 -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! CMD ["./bitwarden_rs"]
\ No newline at end of file diff --git a/docker/amd64/sqlite/Dockerfile b/docker/amd64/sqlite/Dockerfile index 18c428fe..d85f872c 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -80,7 +80,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ - libmariadbclient-dev \ + curl \ && rm -rf /var/lib/apt/lists/* RUN mkdir /data @@ -96,7 +96,7 @@ COPY --from=build app/target/release/bitwarden_rs . 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! CMD ["./bitwarden_rs"] diff --git a/docker/amd64/sqlite/Dockerfile.alpine b/docker/amd64/sqlite/Dockerfile.alpine index ac42d277..32fb0060 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -62,7 +62,7 @@ ENV SSL_CERT_DIR=/etc/ssl/certs # Install needed libraries RUN apk add --no-cache \ openssl \ - mariadb-connector-c \ + curl \ ca-certificates 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 -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! diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index 30c8e491..e867dad1 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -81,6 +81,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ + curl \ libmariadbclient-dev \ && 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 -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! CMD ["./bitwarden_rs"] diff --git a/docker/armv6/sqlite/Dockerfile b/docker/armv6/sqlite/Dockerfile index 0e7dcc02..96b47f60 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -81,7 +81,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ - libmariadbclient-dev \ + curl \ && rm -rf /var/lib/apt/lists/* 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 -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! CMD ["./bitwarden_rs"] diff --git a/docker/armv7/mysql/Dockerfile b/docker/armv7/mysql/Dockerfile index 6271b54a..b1780c65 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -82,6 +82,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ + curl \ libmariadbclient-dev \ && 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 -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! CMD ["./bitwarden_rs"]
\ No newline at end of file diff --git a/docker/armv7/sqlite/Dockerfile b/docker/armv7/sqlite/Dockerfile index cce7c75a..1a70c2c8 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -81,7 +81,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ openssl \ ca-certificates \ - libmariadbclient-dev \ + curl \ && rm -rf /var/lib/apt/lists/* 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 -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! CMD ["./bitwarden_rs"]
\ No newline at end of file |