diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | Docker/Dockerfile-Alpine | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 740b801b1..8efa8023a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# FreshRSS changelog +# FreshRSS changelog ## 2021-XX-XX FreshRSS 1.19.0-dev @@ -20,8 +20,8 @@ * Deployment * Docker: development image `:oldest` is now based on `alpine:3.5` with PHP 7.0.33 and Apache 2.4.35 [#3666](https://github.com/FreshRSS/FreshRSS/pull/3666) * Docker: default image updated to Debian 11 Bullseye with PHP 7.4.21 and Apache 2.4.48 [#3782](https://github.com/FreshRSS/FreshRSS/pull/3782) - * Docker: alternative image updated to Alpine 3.14 with PHP 8.0.10 and Apache 2.4.48 [#3715](https://github.com/FreshRSS/FreshRSS/pull/3715) - * Docker: only add the crontab when CRON_MIN is set. + * Docker: alternative image updated to Alpine 3.15 with PHP 8.0.13 and Apache 2.4.51 [#3996](https://github.com/FreshRSS/FreshRSS/pull/3996) + * Docker: only add the crontab when `CRON_MIN` is set [#3927](https://github.com/FreshRSS/FreshRSS/pull/3927) * Images on Docker Hub are automatically scanned for software vulnerabilities * UI * New thumbnail and/or summary options for the normal view [#3805](https://github.com/FreshRSS/FreshRSS/pull/3805) diff --git a/Docker/Dockerfile-Alpine b/Docker/Dockerfile-Alpine index 70311f162..9d66a7dea 100644 --- a/Docker/Dockerfile-Alpine +++ b/Docker/Dockerfile-Alpine @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.15 ENV TZ UTC SHELL ["/bin/ash", "-eo", "pipefail", "-c"] |