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 | |
| 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')
| -rw-r--r-- | Docker/Dockerfile | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index e5581efe7..eea2ea49c 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -5,7 +5,7 @@ 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 \ + ca-certificates cron curl \ apache2 libapache2-mod-php \ php-curl php-intl php-mbstring php-xml php-zip \ php-sqlite3 php-mysql php-pgsql && \ @@ -17,6 +17,22 @@ WORKDIR /var/www/FreshRSS COPY . /var/www/FreshRSS COPY ./Docker/*.Apache.conf /etc/apache2/sites-available/ +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 a2dismod -f alias autoindex negotiation status && \ a2enmod deflate expires headers mime setenvif && \ a2disconf '*' && \ @@ -38,3 +54,6 @@ EXPOSE 80 CMD ([ -z "$CRON_MIN" ] || cron) && \ . /etc/apache2/envvars && \ exec apache2 -D FOREGROUND + +HEALTHCHECK --start-period=8s --interval=67s --timeout=5s --retries=3 \ + CMD curl -fsS 'http://localhost/i/' | grep -q 'jsonVars' || exit 1 |