From f7cde90f72381040357ab1d43da9cee582f7b384 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Wed, 6 Apr 2022 10:27:54 +0300
Subject: [PATCH] Update Alpine to 3.15.4 version to fix CVE-2022-28391

---
 CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++
 Makefile     | 12 ++++++------
 README.md    | 12 ++++++------
 3 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e94d5d..14e4c03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,42 @@ All user visible changes to this project will be documented in this file. This p
 
 
 
+## [1.5.2-r5] · 2022-04-06
+[1.5.2-r5]: /../../tree/1.5.2-r5
+
+[Diff](/../../compare/1.5.2-r4...1.5.2-r5)
+
+### Security updated
+
+- [Alpine Linux] 3.15.4: <https://github.com/docker-library/official-images/commit/1c3c904f7310fa85d2efad018596cc040e00c018>
+
+
+
+
+## [1.4.13-r5] · 2022-04-06
+[1.4.13-r5]: /../../tree/1.4.13-r5
+
+[Diff](/../../compare/1.4.13-r4...1.4.13-r5)
+
+### Security updated
+
+- [Alpine Linux] 3.15.4: <https://github.com/docker-library/official-images/commit/1c3c904f7310fa85d2efad018596cc040e00c018>
+
+
+
+
+## [1.3.17-r6] · 2022-04-06
+[1.3.17-r6]: /../../tree/1.3.17-r6
+
+[Diff](/../../compare/1.3.17-r5...1.3.17-r6)
+
+### Security updated
+
+- [Alpine Linux] 3.15.4: <https://github.com/docker-library/official-images/commit/1c3c904f7310fa85d2efad018596cc040e00c018>
+
+
+
+
 ## [1.5.2-r4] · 2022-03-29
 [1.5.2-r4]: /../../tree/1.5.2-r4
 
diff --git a/Makefile b/Makefile
index ed53872..768b804 100644
--- a/Makefile
+++ b/Makefile
@@ -22,12 +22,12 @@ NAMESPACES := instrumentisto \
               quay.io/instrumentisto
 NAME := roundcube
 ALL_IMAGES := \
-	1.5/apache:1.5.2-r4-apache,1.5.2-apache,1.5-apache,1-apache,apache,latest \
-	1.5/fpm:1.5.2-r4-fpm,1.5.2-fpm,1.5-fpm,1-fpm,fpm \
-	1.4/apache:1.4.13-r4-apache,1.4.13-apache,1.4-apache \
-	1.4/fpm:1.4.13-r4-fpm,1.4.13-fpm,1.4-fpm \
-	1.3/apache:1.3.17-r5-apache,1.3.17-apache,1.3-apache \
-	1.3/fpm:1.3.17-r5-fpm,1.3.17-fpm,1.3-fpm
+	1.5/apache:1.5.2-r5-apache,1.5.2-apache,1.5-apache,1-apache,apache,latest \
+	1.5/fpm:1.5.2-r5-fpm,1.5.2-fpm,1.5-fpm,1-fpm,fpm \
+	1.4/apache:1.4.13-r5-apache,1.4.13-apache,1.4-apache \
+	1.4/fpm:1.4.13-r5-fpm,1.4.13-fpm,1.4-fpm \
+	1.3/apache:1.3.17-r6-apache,1.3.17-apache,1.3-apache \
+	1.3/fpm:1.3.17-r6-fpm,1.3.17-fpm,1.3-fpm
 #	<Dockerfile>:<version>,<tag1>,<tag2>,...
 
 # Default is first image from ALL_IMAGES list.
diff --git a/README.md b/README.md
index c13877b..031a6ce 100644
--- a/README.md
+++ b/README.md
@@ -17,12 +17,12 @@ Roundcube Webmail Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`1.5.2-r4-apache`, `1.5.2-apache`, `1.5-apache`, `1-apache`, `apache`, `latest`][101]
-- [`1.5.2-r4-fpm`, `1.5.2-fpm`, `1.5-fpm`, `1-fpm`, `fpm`][102]
-- [`1.4.13-r4-apache`, `1.4.13-apache`, `1.4-apache`][103]
-- [`1.4.13-r4-fpm`, `1.4.13-fpm`, `1.4-fpm`][104]
-- [`1.3.17-r5-apache`, `1.3.17-apache`, `1.3-apache`][105]
-- [`1.3.17-r5-fpm`, `1.3.17-fpm`, `1.3-fpm`][106]
+- [`1.5.2-r5-apache`, `1.5.2-apache`, `1.5-apache`, `1-apache`, `apache`, `latest`][101]
+- [`1.5.2-r5-fpm`, `1.5.2-fpm`, `1.5-fpm`, `1-fpm`, `fpm`][102]
+- [`1.4.13-r5-apache`, `1.4.13-apache`, `1.4-apache`][103]
+- [`1.4.13-r5-fpm`, `1.4.13-fpm`, `1.4-fpm`][104]
+- [`1.3.17-r6-apache`, `1.3.17-apache`, `1.3-apache`][105]
+- [`1.3.17-r6-fpm`, `1.3.17-fpm`, `1.3-fpm`][106]