diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-07-07 20:07:01 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-07-07 20:07:01 +0200 |
| commit | 8c2cf1b4dd3a6c79d77f9dc1a256e9d4a8db6a68 (patch) | |
| tree | c8b81ad0d7dfff999c48c67d78685c8a55d0c43b /Docker/Dockerfile-Alpine | |
| parent | dcb090dcd779581c1eddb20b4860848b02139145 (diff) | |
Docker healthcheck+ labels (#2438)
* Add Docker labels
And try to fix the platform metadata for ARM, and add health check
* Execution rights
* Remove experimental features not supported by Docker Hub
"--squash" is only supported on a Docker daemon with experimental
features enabled. build hook failed! (1)
* Fix paths
Diffstat (limited to 'Docker/Dockerfile-Alpine')
| -rw-r--r-- | Docker/Dockerfile-Alpine | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 798a57de1..4078ad0cb 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -3,6 +3,7 @@ FROM alpine:3.10 ENV TZ UTC RUN apk add --no-cache \ + curl \ apache2 php7-apache2 \ php7 php7-curl php7-gmp php7-intl php7-mbstring php7-xml php7-zip \ php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session php7-simplexml php7-xmlreader php7-zlib \ @@ -14,6 +15,22 @@ WORKDIR /var/www/FreshRSS COPY . /var/www/FreshRSS COPY ./Docker/*.Apache.conf /etc/apache2/conf.d/ +ARG FRESHRSS_VERSION +ARG SOURCE_BRANCH +ARG SOURCE_COMMIT + +LABEL \ + org.opencontainers.image.authors="Alkarex" \ + org.opencontainers.image.description="A self-hosted RSS feed aggregator" \ + org.opencontainers.image.documentation="https://freshrss.github.io/FreshRSS/" \ + org.opencontainers.image.licenses="AGPL-3.0" \ + org.opencontainers.image.revision="${SOURCE_BRANCH}.${SOURCE_COMMIT}" \ + org.opencontainers.image.source="https://github.com/FreshRSS/FreshRSS" \ + org.opencontainers.image.title="FreshRSS" \ + org.opencontainers.image.url="https://freshrss.org/" \ + org.opencontainers.image.vendor="FreshRSS" \ + org.opencontainers.image.version="$FRESHRSS_VERSION" + RUN rm -f /etc/apache2/conf.d/languages.conf /etc/apache2/conf.d/info.conf \ /etc/apache2/conf.d/status.conf /etc/apache2/conf.d/userdir.conf && \ sed -r -i "/^\s*LoadModule .*mod_(alias|autoindex|negotiation|status).so$/s/^/#/" \ @@ -34,3 +51,6 @@ ENTRYPOINT ["./Docker/entrypoint.sh"] EXPOSE 80 CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \ exec httpd -D FOREGROUND + +HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ + CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 |