From f9408a00c6dbbf28ac9b29b0e7ee8f04bc76925c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Wed, 11 Sep 2019 22:01:42 +0200 Subject: [PATCH] Allow self signed certs and increase a bit the timings --- docker/aarch64/mysql/Dockerfile | 2 +- docker/aarch64/sqlite/Dockerfile | 2 +- docker/amd64/mysql/Dockerfile | 2 +- docker/amd64/mysql/Dockerfile.alpine | 2 +- docker/amd64/sqlite/Dockerfile | 2 +- docker/amd64/sqlite/Dockerfile.alpine | 2 +- docker/armv6/mysql/Dockerfile | 2 +- docker/armv6/sqlite/Dockerfile | 2 +- docker/armv7/mysql/Dockerfile | 2 +- docker/armv7/sqlite/Dockerfile | 2 +- docker/healthcheck.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/aarch64/mysql/Dockerfile b/docker/aarch64/mysql/Dockerfile index 1ae2bdbc..cf595fff 100644 --- a/docker/aarch64/mysql/Dockerfile +++ b/docker/aarch64/mysql/Dockerfile @@ -100,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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 9f8f2952..097e6deb 100644 --- a/docker/aarch64/sqlite/Dockerfile +++ b/docker/aarch64/sqlite/Dockerfile @@ -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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 fa4121f7..a51163f4 100644 --- a/docker/amd64/mysql/Dockerfile +++ b/docker/amd64/mysql/Dockerfile @@ -97,7 +97,7 @@ COPY --from=build app/target/release/bitwarden_rs . COPY docker/healthcheck.sh ./healthcheck.sh -HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 8d217c76..acea3bd8 100644 --- a/docker/amd64/mysql/Dockerfile.alpine +++ b/docker/amd64/mysql/Dockerfile.alpine @@ -79,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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 f034b7ba..b03a284c 100644 --- a/docker/amd64/sqlite/Dockerfile +++ b/docker/amd64/sqlite/Dockerfile @@ -96,7 +96,7 @@ COPY --from=build app/target/release/bitwarden_rs . COPY docker/healthcheck.sh ./healthcheck.sh -HEALTHCHECK --interval=10s --timeout=1s CMD sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 e979a870..cea82043 100644 --- a/docker/amd64/sqlite/Dockerfile.alpine +++ b/docker/amd64/sqlite/Dockerfile.alpine @@ -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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! diff --git a/docker/armv6/mysql/Dockerfile b/docker/armv6/mysql/Dockerfile index 185afa2a..da3c7c86 100644 --- a/docker/armv6/mysql/Dockerfile +++ b/docker/armv6/mysql/Dockerfile @@ -100,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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 593717d6..3aeb2ea4 100644 --- a/docker/armv6/sqlite/Dockerfile +++ b/docker/armv6/sqlite/Dockerfile @@ -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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 b603d0b3..367e25bd 100644 --- a/docker/armv7/mysql/Dockerfile +++ b/docker/armv7/mysql/Dockerfile @@ -101,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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s 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 72c1256c..21bb210c 100644 --- a/docker/armv7/sqlite/Dockerfile +++ b/docker/armv7/sqlite/Dockerfile @@ -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 sh healthcheck.sh || exit 1 +HEALTHCHECK --interval=30s --timeout=3s CMD sh healthcheck.sh || exit 1 # Configures the startup! CMD ["./bitwarden_rs"] \ No newline at end of file diff --git a/docker/healthcheck.sh b/docker/healthcheck.sh index 7b4e3fc2..bd7e696f 100644 --- a/docker/healthcheck.sh +++ b/docker/healthcheck.sh @@ -4,5 +4,5 @@ if [ -z "$ROCKET_TLS"] then curl --fail http://localhost:${ROCKET_PORT:-"80"}/alive || exit 1 else - curl --fail https://localhost:${ROCKET_PORT:-"80"}/alive || exit 1 + curl --insecure --fail https://localhost:${ROCKET_PORT:-"80"}/alive || exit 1 fi \ No newline at end of file