From f383e5e8234d204cf9a18f06340519f097c6bdc1 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Sat, 28 Aug 2021 10:57:01 +0300
Subject: [PATCH] Update alpine to 3.14.2 version in Docker image to fix
 CVE-2021-3711 and CVE-2021-3712

Additionally:
- slightly refactor Makefile for Docker images
---
 docker/coturn/CHANGELOG.md      | 10 ++++++++++
 docker/coturn/Makefile          | 15 ++++++---------
 docker/coturn/README.md         |  4 ++--
 docker/coturn/alpine/Dockerfile |  2 +-
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/docker/coturn/CHANGELOG.md b/docker/coturn/CHANGELOG.md
index ff3053b..af571eb 100644
--- a/docker/coturn/CHANGELOG.md
+++ b/docker/coturn/CHANGELOG.md
@@ -4,6 +4,16 @@ Coturn TURN server Docker image changelog
 
 
 
+## [4.5.2-r4] · 2021-08-28
+[4.5.2-r4]: /../../tree/docker/4.5.2-r4
+
+### Security updated
+
+- [Alpine Linux] 3.14.2: <https://github.com/docker-library/official-images/commit/b54effe0cc65795f29752ecc197328a04326a6f2>
+
+
+
+
 ## [4.5.2-r3] · 2021-08-09
 [4.5.2-r3]: /../../tree/docker/4.5.2-r3
 
diff --git a/docker/coturn/Makefile b/docker/coturn/Makefile
index e212d84..3ad998d 100644
--- a/docker/coturn/Makefile
+++ b/docker/coturn/Makefile
@@ -21,7 +21,7 @@ COTURN_VER ?= 4.5.2
 COTURN_MIN_VER = $(strip $(shell echo $(COTURN_VER) | cut -d '.' -f1,2))
 COTURN_MAJ_VER = $(strip $(shell echo $(COTURN_VER) | cut -d '.' -f1))
 
-BUILD_REV ?= 3
+BUILD_REV ?= 4
 
 NAMESPACES := coturn \
               ghcr.io/coturn \
@@ -71,8 +71,7 @@ test: test.docker
 
 docker-namespaces = $(strip $(if $(call eq,$(namespaces),),\
                             $(NAMESPACES),$(subst $(comma), ,$(namespaces))))
-docker-tags = $(subst $(comma), ,$(strip \
-                      $(if $(call eq,$(tags),),$(TAGS),$(tags))))
+docker-tags = $(subst $(comma), ,$(or $(tags),$(TAGS)))
 docker-platforms = $(strip $(if $(call eq,$(platforms),),\
                            $(PLATFORMS),$(subst $(comma), ,$(platforms))))
 
@@ -130,9 +129,9 @@ docker.build.cache:
 docker.image:
 	$(call docker.buildx,$(DOCKERFILE),\
 		coturn,\
-		$(if $(call eq,$(tag),),$(VERSION),$(tag)),\
+		$(or $(tag),$(VERSION)),\
 		$(ref),\
-		$(if $(call eq,$(platform),),$(MAIN_PLATFORM),$(platform)),\
+		$(or $(platform),$(MAIN_PLATFORM)),\
 		$(no-cache),\
 		--load)
 
@@ -186,9 +185,7 @@ ifeq ($(wildcard node_modules/.bin/bats),)
 	@make npm.install
 endif
 	$(foreach platform,$(test-docker-platforms),\
-		$(call test.docker.do,\
-			$(if $(call eq,$(tag),),$(VERSION),$(tag)),\
-			$(platform)))
+		$(call test.docker.do,$(or $(tag),$(VERSION)),$(platform)))
 define test.docker.do
 	$(eval tag := $(strip $(1)))
 	$(eval platform := $(strip $(2)))
@@ -235,7 +232,7 @@ endif
 # Usage:
 #	make git.release [ver=($(VERSION)|<proj-ver>)]
 
-git-release-tag = docker/$(strip $(if $(call eq,$(ver),),$(VERSION),$(ver)))
+git-release-tag = docker/$(strip $(or $(ver),$(VERSION)))
 
 git.release:
 ifeq ($(shell git rev-parse $(git-release-tag) >/dev/null 2>&1 && echo "ok"),ok)
diff --git a/docker/coturn/README.md b/docker/coturn/README.md
index 59feada..b094343 100644
--- a/docker/coturn/README.md
+++ b/docker/coturn/README.md
@@ -15,8 +15,8 @@ Coturn TURN server Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`4.5.2-r3`, `4.5.2-r3-debian`, `4.5.2`, `4.5.2-debian`, `4.5`, `4.5-debian`, `4`, `4-debian`, `debian`, `latest`][d1]
-- [`4.5.2-r3-alpine`, `4.5.2-alpine`, `4.5-alpine`, `4-alpine`, `alpine`][d2]
+- [`4.5.2-r4`, `4.5.2-r3-debian`, `4.5.2`, `4.5.2-debian`, `4.5`, `4.5-debian`, `4`, `4-debian`, `debian`, `latest`][d1]
+- [`4.5.2-r4-alpine`, `4.5.2-alpine`, `4.5-alpine`, `4-alpine`, `alpine`][d2]
 
 
 
diff --git a/docker/coturn/alpine/Dockerfile b/docker/coturn/alpine/Dockerfile
index e4e6249..59c8bcc 100644
--- a/docker/coturn/alpine/Dockerfile
+++ b/docker/coturn/alpine/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile of coturn/coturn:alpine Docker image.
 #
 
-ARG alpine_ver=3.14.1
+ARG alpine_ver=3.14.2