diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2020-04-25 12:27:25 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-04-25 12:27:25 +0200 |
| commit | 0f7970b4c054c4890b59e39cb0fdf652c0acb6a1 (patch) | |
| tree | e2e4907e9d7d735dbdaab83e1e2397b3bfd89200 /Docker | |
| parent | dba40e58704a374755677ef1f24f6872a34bad80 (diff) | |
Docker: Ubuntu 20.04 (#2925)
https://ubuntu.com/blog/ubuntu-20-04-lts-arrives
PHP 7.4.3, Apache 2.4.41
https://php.net/migration74
We have already addressed PHP 7.4 issues in FreshRSS 1.16
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 6dbebccb0..1730a8a3f 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:19.10 +FROM ubuntu:20.04 ENV TZ UTC SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index 30b1e205b..9ed807b7d 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:19.10 +FROM arm32v7/ubuntu:20.04 # Requires ./hooks/* COPY ./Docker/qemu-arm-* /usr/bin/ |