diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2020-05-02 18:24:13 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-05-02 18:24:13 +0200 |
| commit | af575e061d8cd08f4e3c3ccf5b5d1d7a352cf50f (patch) | |
| tree | 5b5297778d3a500317e784f3f7f2f20027edc53b | |
| parent | 960ecd2d09c7ae865e761e0ae8c7eb3f85566afd (diff) | |
Revert to Ubuntu 19.10 (#2943)
* Revert to Ubuntu 19.10
#Fix https://github.com/FreshRSS/FreshRSS/issues/2939
Revert https://github.com/FreshRSS/FreshRSS/pull/2925
Will upgrade back to 20.04 when Ubuntu bugs are fixed, e.g.
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1867675
* Revert changelog
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c1113aea..f8c21b04f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ * Fix styling of search input fields in Safari [#2887](https://github.com/FreshRSS/FreshRSS/pull/2887) * Upgrade to jQuery 3.5.0 for statistics [#2895](https://github.com/FreshRSS/FreshRSS/pull/2895) * Deployment - * Docker: Ubuntu image updated to 20.04 with PHP 7.4.3 and Apache 2.4.41 [#2925](https://github.com/FreshRSS/FreshRSS/pull/2925) * Docker: Alpine image updated to PHP 7.3.17 * Add reference documentation for using Apache as a reverse proxy [#2919](https://github.com/FreshRSS/FreshRSS/pull/2919) * Enforce Unix line endings when checking out via git [#2879](https://github.com/FreshRSS/FreshRSS/pull/2879) diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 1730a8a3f..6dbebccb0 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:19.10 ENV TZ UTC SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index 9ed807b7d..30b1e205b 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -1,7 +1,7 @@ # 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:20.04 +FROM arm32v7/ubuntu:19.10 # Requires ./hooks/* COPY ./Docker/qemu-arm-* /usr/bin/ |