From af575e061d8cd08f4e3c3ccf5b5d1d7a352cf50f Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 2 May 2020 18:24:13 +0200 Subject: 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 --- Docker/Dockerfile | 2 +- Docker/Dockerfile-QEMU-ARM | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Docker') 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/ -- cgit v1.2.3