Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2451 from FreshRSS/dev
FreshRSS 1.14.3
- Loading branch information
Showing
79 changed files
with
652 additions
and
162 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| ignored: | ||
| # ignore apt version pinning | ||
| - DL3008 | ||
| # ignore apk version pinning | ||
| - DL3018 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| # Only relevant for Docker Hub or QEMU multi-architecture builds. | ||
| # Prefer the normal `Dockerfile` if you are building manually on the targeted architecture. | ||
|
|
||
| FROM arm32v7/ubuntu:19.04 | ||
|
|
||
| # Requires ./hooks/* | ||
| COPY ./Docker/qemu-arm-* /usr/bin/ | ||
|
|
||
| ENV TZ UTC | ||
| SHELL ["/bin/bash", "-o", "pipefail", "-c"] | ||
| RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone | ||
|
|
||
| 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 && \ | ||
| rm -rf /var/lib/apt/lists/* | ||
|
|
||
| RUN mkdir -p /var/www/FreshRSS/ /run/apache2/ | ||
| 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 '*' && \ | ||
| a2dissite '*' && \ | ||
| a2ensite 'FreshRSS*' | ||
|
|
||
| RUN sed -r -i "/^\s*(CustomLog|ErrorLog|Listen) /s/^/#/" /etc/apache2/apache2.conf && \ | ||
| sed -r -i "/^\s*Listen /s/^/#/" /etc/apache2/ports.conf && \ | ||
| touch /var/www/FreshRSS/Docker/env.txt && \ | ||
| echo "17,47 * * * * . /var/www/FreshRSS/Docker/env.txt; \ | ||
| su www-data -s /bin/sh -c 'php /var/www/FreshRSS/app/actualize_script.php' \ | ||
| 2>> /proc/1/fd/2 > /tmp/FreshRSS.log" | crontab - | ||
|
|
||
| # Seems needed for arm32v7/ubuntu on Docker Hub | ||
| RUN update-ca-certificates -f | ||
|
|
||
| # Useful with the `--squash` build option | ||
| RUN rm /usr/bin/qemu-* /var/www/FreshRSS/Docker/qemu-* | ||
|
|
||
| ENV COPY_SYSLOG_TO_STDERR On | ||
| ENV CRON_MIN '' | ||
| ENTRYPOINT ["./Docker/entrypoint.sh"] | ||
|
|
||
| EXPOSE 80 | ||
| # hadolint ignore=DL3025 | ||
| CMD ([ -z "$CRON_MIN" ] || cron) && \ | ||
| . /etc/apache2/envvars && \ | ||
| exec apache2 -D FOREGROUND | ||
|
|
||
| HEALTHCHECK --start-period=20s --interval=37s --timeout=5s --retries=3 \ | ||
| CMD (php -r "readfile('http://localhost/i/');" | grep -q 'jsonVars') || exit 1 |
Oops, something went wrong.