diff options
| author |  Sandro Jäckel <sandro.jaeckel@gmail.com>
| 2019-07-22 15:26:55 +0200 |
|---|---|---|
| committer |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-07-22 15:26:55 +0200 |
| commit | 71270e4d5c7f0645a31a8dc7ccc56cea6a9711b0 (patch) | |
| tree | 0ea411321a7280ecc50b3d345299bae5abe18d98 /Docker/Dockerfile | |
| parent | 0a297addc060692f163c2614aa9989f5840f494a (diff) | |
Replace curl healthcheck with pure php, apply haodlint suggestions (#2455)
Closes #2453
Diffstat (limited to 'Docker/Dockerfile')
| -rw-r--r-- | Docker/Dockerfile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 1eac3687b..11a44797f 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,11 +1,12 @@ FROM ubuntu:19.04 ENV TZ UTC +SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone -RUN apt update && \ - apt install --no-install-recommends -y \ - ca-certificates cron curl \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ + ca-certificates cron \ apache2 libapache2-mod-php \ php-curl php-gmp php-intl php-mbstring php-xml php-zip \ php-sqlite3 php-mysql php-pgsql && \ @@ -56,4 +57,4 @@ CMD ([ -z "$CRON_MIN" ] || cron) && \ exec apache2 -D FOREGROUND HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ - CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 + CMD (php -r "readfile('http://localhost/i/');" | grep -q 'jsonVars') || exit 1 |