diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-02-03 12:41:27 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-02-03 12:41:27 +0100 |
| commit | e4f1ec9e28a9c614f9e8e51b71069736ad3bbaa3 (patch) | |
| tree | 4e0c09e44022891cdc8861c7651f1f0d96e7accf | |
| parent | 44dab04a4a7b28ebce4b9954cd78b7b6bac03f38 (diff) | |
| parent | 5bd3d92b9f1abad9f27cbe7fc138a328f8dbaa6f (diff) | |
Merge pull request #2238 from Alkarex/alpine3.9
Alpine 3.9
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | Docker/Dockerfile | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 685be5a62..5a79e47dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 2019-0X-XX FreshRSS 1.13.2-dev +* Deployment + * Docker image updated to Alpine 3.9 with PHP 7.2.14 and Apache 2.4.38 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238) + ## 2019-01-26 FreshRSS 1.13.1 diff --git a/Docker/Dockerfile b/Docker/Dockerfile index a4be9fd84..cd0f521a0 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.9 ENV TZ UTC |