summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-07-07 13:45:38 +0200
committerGravatar GitHub <noreply@github.com> 2018-07-07 13:45:38 +0200
commite0bc6a28553e4109663aef6280a0712d7594a396 (patch)
tree1a7b1bfd1b9984f720a00f67459543576217cdd3
parenta66b995be7d187a208bf7f66ce4d83911ba5932f (diff)
Docker from Alpine 3.8 (#1956)
PHP 7.2 http://php.net/manual/migration72.incompatible.php TODO: create_function() is deprecated (used by lib_phpQuery.php)
-rw-r--r--CHANGELOG.md2
-rw-r--r--Docker/Dockerfile2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a5c991550..edf91f8b2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## 2018-XX-XX FreshRSS 1.11.2-dev
+* Deployment
+ * Update Docker image to Alpine 3.8 with PHP 7.2 [#1956](https://github.com/FreshRSS/FreshRSS/pull/1956)
* Bug fixing
* Fix bugs when searching with special characters (e.g. preventing marking as read) [#1944](https://github.com/FreshRSS/FreshRSS/issues/1944)
* Mics.
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index 189d7175a..cca7bb65e 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:3.8
RUN apk add --no-cache \
apache2 php7-apache2 \