From 68cc039bc76dad419fda0c7e37f7da3980ada881 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 6 Jul 2019 14:52:50 +0200 Subject: A few more badges https://shields.io/ --- Docker/README.md | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Docker/README.md') diff --git a/Docker/README.md b/Docker/README.md index 9bf20c8c2..cdb6a0a4e 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -1,3 +1,8 @@ +![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/freshrss/freshrss.svg) +![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/freshrss/freshrss.svg) +![MicroBadger Size](https://img.shields.io/microbadger/image-size/freshrss/freshrss.svg) +![Docker Pulls](https://img.shields.io/docker/pulls/freshrss/freshrss.svg) + # Deploy FreshRSS with Docker * See also https://hub.docker.com/r/freshrss/freshrss/ -- cgit v1.2.3 From dcb090dcd779581c1eddb20b4860848b02139145 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sun, 7 Jul 2019 00:15:13 +0200 Subject: Docker build for ARM (Raspberry Pi) (#2436) * Docker build for ARM (Raspberry Pi) Inspired by https://github.com/stas-demydiuk/domoticz-docker * Execution rights * Readme typo * Move QEMU higher up * Change tar command * Try to fix COPY error * Fix path bug --- Docker/Dockerfile-QEMU-ARM | 46 ++++++++++++++++++++++++++++++++++++++++++++++ Docker/README.md | 5 +++-- Docker/hooks/pre_build | 12 ++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 Docker/Dockerfile-QEMU-ARM create mode 100755 Docker/hooks/pre_build (limited to 'Docker/README.md') diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM new file mode 100644 index 000000000..889be2cb8 --- /dev/null +++ b/Docker/Dockerfile-QEMU-ARM @@ -0,0 +1,46 @@ +# 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-* /usr/bin/ + +ENV TZ UTC +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 \ + apache2 libapache2-mod-php \ + php-curl 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/ + +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 - + +ENV COPY_SYSLOG_TO_STDERR On +ENV CRON_MIN '' +ENTRYPOINT ["./Docker/entrypoint.sh"] + +EXPOSE 80 +CMD ([ -z "$CRON_MIN" ] || cron) && \ + . /etc/apache2/envvars && \ + exec apache2 -D FOREGROUND diff --git a/Docker/README.md b/Docker/README.md index cdb6a0a4e..c2db38fb5 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -37,6 +37,7 @@ sudo docker run -d --restart unless-stopped --log-opt max-size=10m \ -p 80:80 \ -p 443:443 \ --name traefik traefik --docker \ + --loglevel=info \ --entryPoints='Name:http Address::80 Compress:true Redirect.EntryPoint:https' \ --entryPoints='Name:https Address::443 Compress:true TLS TLS.MinVersion:VersionTLS12 TLS.SniStrict:true TLS.CipherSuites:TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA' \ --defaultentrypoints=http,https --keeptrailingslash=true \ @@ -51,7 +52,7 @@ See [more information about Docker and Let’s Encrypt in Træfik](https://docs. Example using the built-in refresh cron job (see further below for alternatives). You must first chose a domain (DNS) or sub-domain, e.g. `freshrss.example.net`. -> **N.B.:** For platforms other than x64 (Intel, AMD), such as ARM (e.g. Raspberry Pi), see the section *Build Docker image* further below. +> **N.B.:** Default images are for x64 (Intel, AMD) platforms. For ARM (e.g. Raspberry Pi), use the `*-arm` tags. For other platforms, see the section *Build Docker image* further below. ```sh sudo docker volume create freshrss-data @@ -137,7 +138,7 @@ The tags correspond to FreshRSS branches and versions: * `:x.y.z` are specific FreshRSS releases ### Linux: Ubuntu vs. Alpine -Our default image is based on [Ubuntu](https://www.ubuntu.com/server). We offer an alternative based on [Alpine](https://alpinelinux.org/) (with the `-alpine` tag suffix). +Our default image is based on [Ubuntu](https://www.ubuntu.com/server). We offer an alternative based on [Alpine](https://alpinelinux.org/) (with the `*-alpine` tag suffix). In [our tests](https://github.com/FreshRSS/FreshRSS/pull/2205), Ubuntu is ~3 times faster, while Alpine is ~2.5 times [smaller on disk](https://hub.docker.com/r/freshrss/freshrss/tags) (and much faster to build). diff --git a/Docker/hooks/pre_build b/Docker/hooks/pre_build new file mode 100755 index 000000000..f6c8211c0 --- /dev/null +++ b/Docker/hooks/pre_build @@ -0,0 +1,12 @@ +#!/bin/bash + +if [[ "$DOCKERFILE_PATH" == *-ARM ]]; +then + # https://github.com/balena-io/qemu + # Download a local copy of QEMU on Docker Hub build machine + curl -LSs 'https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz' | tar -xzv --strip-components=1 --wildcards '*/qemu-*' + + # https://github.com/multiarch/qemu-user-static + # Register qemu-*-static for all supported processors except the current one, but also remove all registered binfmt_misc before + docker run --rm --privileged multiarch/qemu-user-static:register --reset +fi -- cgit v1.2.3 From af8b39a20444b16365c144c10ae5e58d08857bc0 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Mon, 8 Jul 2019 13:10:51 +0200 Subject: Changelog, credits https://github.com/FreshRSS/FreshRSS/issues/2429 https://github.com/FreshRSS/FreshRSS/pull/2431 https://github.com/FreshRSS/FreshRSS/issues/2437 https://github.com/FreshRSS/FreshRSS/pull/2439 --- CHANGELOG.md | 4 ++++ CREDITS.md | 2 ++ Docker/README.md | 2 ++ 3 files changed, 8 insertions(+) (limited to 'Docker/README.md') diff --git a/CHANGELOG.md b/CHANGELOG.md index 332d7ba3e..f548bc86b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Security * Allow `@-` as valid characters in usernames (i.e. allow most e-mails) [#2391](https://github.com/FreshRSS/FreshRSS/issues/2391) * Bug fixing + * Fix wrong mark-as-read limit [#2429](https://github.com/FreshRSS/FreshRSS/issues/2429) * Fix API call for removing a category [#2411](https://github.com/FreshRSS/FreshRSS/issues/2411) * Fix refresh icon in Swage theme [#2375](https://github.com/FreshRSS/FreshRSS/issues/2375) * Fix message banner in Swage theme [#2379](https://github.com/FreshRSS/FreshRSS/issues/2379) @@ -12,8 +13,11 @@ * New configuration page for each category [#2369](https://github.com/FreshRSS/FreshRSS/issues/2369) * Update shortcut configuration page [#2405](https://github.com/FreshRSS/FreshRSS/issues/2405) * CSS style for printing [#2149](https://github.com/FreshRSS/FreshRSS/issues/2149) + * Do not hide multiple `
` tags [#2437](https://github.com/FreshRSS/FreshRSS/issues/2437) * Updated to jQuery 3.4.1 [#2424](https://github.com/FreshRSS/FreshRSS/pull/2424) * Deployment + * Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438) + * Docker: Add a version for ARM achitecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436) * Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422) * Docker: Alpine image updated to 3.10 with PHP 7.3.6 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) * I18n diff --git a/CREDITS.md b/CREDITS.md index c1dd4f502..727fe64b6 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -61,6 +61,8 @@ People are sorted by name so please keep this order. * [Quentin Pagès](https://github.com/Quenty31): [contributions](https://github.com/FreshRSS/documentation/commits?author=Quenty31) * [Ramón Cutanda](https://github.com/rcutanda): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rcutanda) * [romibi](https://github.com/romibi): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=romibi) +* [Rosemary Le Faive](https://github.com/rosiel): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:rosiel) +* [Sandro Jäckel](https://github.com/SuperSandro2000): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:SuperSandro2000), [Web](https://supersandro.de/) * [sirideain](https://github.com/sirideain): [contributions](https://github.com/FreshRSS/FreshRSS/commits/dev?author=sirideain) * [Sp3r4z](https://github.com/Sp3r4z): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Sp3r4z) * [subic](https://github.com/subic): [contributions](https://github.com/FreshRSS/documentation/commits?author=subic) diff --git a/Docker/README.md b/Docker/README.md index c2db38fb5..c93178ff7 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -75,6 +75,7 @@ sudo docker run -d --restart unless-stopped --log-opt max-size=10m \ `--label traefik.frontend.rule='Host:freshrss.example.net;PathPrefixStrip:/FreshRSS/' \` * You may remove the `--label traefik.*` lines if you do not use Træfik. * Add `-p 8080:80 \` if you want to expose FreshRSS locally, e.g. on port `8080`. +* Replace `freshrss/freshrss` by a more specific tag (see below) such as `freshrss/freshrss:dev` for the development version, or `freshrss/freshrss:arm` for a Raspberry Pi version. This already works with a built-in **SQLite** database (easiest), but more powerful databases are supported: @@ -136,6 +137,7 @@ The tags correspond to FreshRSS branches and versions: * `:latest` (default) is the `master` branch, more stable * `:dev` is the `dev` branch, rolling release * `:x.y.z` are specific FreshRSS releases +* `:arm` or `:*-arm` are the ARM versions (e.g. for Raspberry Pi) ### Linux: Ubuntu vs. Alpine Our default image is based on [Ubuntu](https://www.ubuntu.com/server). We offer an alternative based on [Alpine](https://alpinelinux.org/) (with the `*-alpine` tag suffix). -- cgit v1.2.3