From d7db17f048675f46fc2b30827813eeaf0c822fb2 Mon Sep 17 00:00:00 2001 From: tyranron Date: Wed, 5 Jul 2023 12:27:59 +0300 Subject: [PATCH] Fix redundant Docker image tags with major OS version (#1230, #1226) --- docker/coturn/Makefile | 4 ++-- docker/coturn/README.md | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker/coturn/Makefile b/docker/coturn/Makefile index 043fa0d..99a838f 100644 --- a/docker/coturn/Makefile +++ b/docker/coturn/Makefile @@ -42,8 +42,8 @@ REGISTRIES := $(strip $(subst $(comma), ,\ $(shell grep -m1 'registry: \["' ../../.github/workflows/docker.yml \ | cut -d':' -f2 | tr -d '"]['))) ALL_IMAGES := \ - debian:$(COTURN_VER)-r$(BUILD_REV)-debian,$(COTURN_VER)-debian,$(COTURN_MIN_VER)-debian,$(COTURN_MAJ_VER)-debian,debian,$(COTURN_VER)-r$(BUILD_REV)-$(DEBIAN_VER),$(COTURN_VER)-$(DEBIAN_VER),$(COTURN_MIN_VER)-$(DEBIAN_VER),$(COTURN_MAJ_VER)-$(DEBIAN_VER),$(DEBIAN_VER),$(COTURN_VER)-r$(BUILD_REV),$(COTURN_VER),$(COTURN_MIN_VER),$(COTURN_MAJ_VER),latest \ - alpine:$(COTURN_VER)-r$(BUILD_REV)-alpine,$(COTURN_VER)-alpine,$(COTURN_MIN_VER)-alpine,$(COTURN_MAJ_VER)-alpine,alpine,$(COTURN_VER)-r$(BUILD_REV)-$(ALPINE_VER),$(COTURN_VER)-$(ALPINE_VER),$(COTURN_MIN_VER)-$(ALPINE_VER),$(COTURN_MAJ_VER)-$(ALPINE_VER),$(ALPINE_VER) + debian:$(COTURN_VER)-r$(BUILD_REV)-debian,$(COTURN_VER)-debian,$(COTURN_MIN_VER)-debian,$(COTURN_MAJ_VER)-debian,debian,$(COTURN_VER)-$(DEBIAN_VER),$(COTURN_MIN_VER)-$(DEBIAN_VER),$(COTURN_MAJ_VER)-$(DEBIAN_VER),$(DEBIAN_VER),$(COTURN_VER)-r$(BUILD_REV),$(COTURN_VER),$(COTURN_MIN_VER),$(COTURN_MAJ_VER),latest \ + alpine:$(COTURN_VER)-r$(BUILD_REV)-alpine,$(COTURN_VER)-alpine,$(COTURN_MIN_VER)-alpine,$(COTURN_MAJ_VER)-alpine,alpine,$(COTURN_VER)-$(ALPINE_VER),$(COTURN_MIN_VER)-$(ALPINE_VER),$(COTURN_MAJ_VER)-$(ALPINE_VER),$(ALPINE_VER) # :,,,... # Default is first image from ALL_IMAGES list. diff --git a/docker/coturn/README.md b/docker/coturn/README.md index 6e0fcd6..3274307 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.6.2-r4`, `4.6.2-r4-debian`, `4.6.2-r4-bookworm`, `4.6.2`, `4.6.2-debian`, `4.6.2-bookworm`, `4.6`, `4.6-debian`, `4.6-bookworm`, `4`, `4-debian`, `4-bookworm`, `debian`, `bookworm`, `latest`][d1] -- [`4.6.2-r4-alpine`, `4.6.2-r4-alpine3.18`, `4.6.2-alpine`, `4.6.2-alpine3.18`, `4.6-alpine`, `4.6-alpine3.18`, `4-alpine`, `4-alpine3.18`, `alpine`, `alpine3.18`][d2] +- [`4.6.2-r4`, `4.6.2-r4-debian`, `4.6.2`, `4.6.2-debian`, `4.6.2-bookworm`, `4.6`, `4.6-debian`, `4.6-bookworm`, `4`, `4-debian`, `4-bookworm`, `debian`, `bookworm`, `latest`][d1] +- [`4.6.2-r4-alpine`, `4.6.2-alpine`, `4.6.2-alpine3.18`, `4.6-alpine`, `4.6-alpine3.18`, `4-alpine`, `4-alpine3.18`, `alpine`, `alpine3.18`][d2] @@ -169,7 +169,7 @@ This is a multi-platform image. ### `-r-`/`-r-` -Concrete `N` image revision tag of the concrete `X.Y.Z` (or `X.Y.Z.W`) Coturn version on the concrete `dist` (`alpine3.18`, or `bookworm`, or latest `alpine`/`debian`). +Concrete `N` image revision tag of the concrete `X.Y.Z` (or `X.Y.Z.W`) Coturn version on the concrete `dist` (`alpine` or `debian`). Once built, it's never updated. @@ -178,7 +178,7 @@ This is a multi-platform image. ### `-r--`/`-r--` -Concrete `N` image revision tag of the concrete `X.Y.Z` (or `X.Y.Z.W`) Coturn version on the concrete `dist` (`alpine3.18`, or `bookworm`, or latest `alpine`/`debian`) and `arch`. +Concrete `N` image revision tag of the concrete `X.Y.Z` (or `X.Y.Z.W`) Coturn version on the concrete `dist` (`alpine` or `debian`) and `arch`. Once build, it's never updated. @@ -187,14 +187,14 @@ This is a single-platform image. ### `edge-` -Latest tag of the latest `master` branch of Coturn on the concrete `dist` (latest `alpine`/`debian`). +Latest tag of the latest `master` branch of Coturn on the concrete `dist` (`alpine` or `debian`). This is a multi-platform image. ### `edge--` -Latest tag of the latest `master` branch of Coturn on the concrete `dist` (latest `alpine`/`debian`) and `arch`. +Latest tag of the latest `master` branch of Coturn on the concrete `dist` (`alpine` or `debian`) and `arch`. This is a single-platform image.