From 2a23095cc46412f2e321ef5ba6bce8a0f4931125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Mon, 30 May 2022 15:24:15 +0200
Subject: [PATCH] misc: use the "unstable" tag between releases

In addition the "latest" tag will be gone with the next stable release.

Going forward this is our versioning scheme:

- stable-XXXX: stable release
- unstable: daily unstable rolling release
- unstable-XXXX-YY: daily unstable release
---
 Makefile           | 5 ++---
 docker-compose.yml | 8 ++++----
 jibri.yml          | 2 +-
 jigasi.yml         | 2 +-
 release.sh         | 8 ++++----
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 7edd9da..c82c113 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 FORCE_REBUILD ?= 0
 JITSI_RELEASE ?= stable
-JITSI_BUILD ?= latest
+JITSI_BUILD ?= unstable
 JITSI_REPO ?= jitsi
 NATIVE_ARCH ?= $(shell uname -m)
 
@@ -43,10 +43,9 @@ $(addprefix build_,$(JITSI_SERVICES)):
 	$(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build
 
 tag:
-	docker tag $(JITSI_REPO)/$(JITSI_SERVICE):latest $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
+	docker tag $(JITSI_REPO)/$(JITSI_SERVICE) $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
 
 push:
-	docker push $(JITSI_REPO)/$(JITSI_SERVICE):latest
 	docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
 
 %-all:
diff --git a/docker-compose.yml b/docker-compose.yml
index 0491e20..7490292 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # Frontend
     web:
-        image: jitsi/web:latest
+        image: jitsi/web:unstable
         restart: ${RESTART_POLICY}
         ports:
             - '${HTTP_PORT}:80'
@@ -139,7 +139,7 @@ services:
 
     # XMPP server
     prosody:
-        image: jitsi/prosody:latest
+        image: jitsi/prosody:unstable
         restart: ${RESTART_POLICY}
         expose:
             - '${XMPP_PORT:-5222}'
@@ -221,7 +221,7 @@ services:
 
     # Focus component
     jicofo:
-        image: jitsi/jicofo:latest
+        image: jitsi/jicofo:unstable
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jicofo:/config:Z
@@ -273,7 +273,7 @@ services:
 
     # Video bridge
     jvb:
-        image: jitsi/jvb:latest
+        image: jitsi/jvb:unstable
         restart: ${RESTART_POLICY}
         ports:
             - '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
diff --git a/jibri.yml b/jibri.yml
index df776de..c6807ac 100644
--- a/jibri.yml
+++ b/jibri.yml
@@ -2,7 +2,7 @@ version: '3'
 
 services:
     jibri:
-        image: jitsi/jibri:latest
+        image: jitsi/jibri:unstable
         restart: ${RESTART_POLICY}
         volumes:
             - ${CONFIG}/jibri:/config:Z
diff --git a/jigasi.yml b/jigasi.yml
index 90c8c52..ac434a0 100644
--- a/jigasi.yml
+++ b/jigasi.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
     # SIP gateway (audio)
     jigasi:
-        image: jitsi/jigasi:latest
+        image: jitsi/jigasi:unstable
         restart: ${RESTART_POLICY}
         ports:
             - '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'
diff --git a/release.sh b/release.sh
index 3c6998c..b19f6f3 100755
--- a/release.sh
+++ b/release.sh
@@ -45,7 +45,7 @@ mv tmp CHANGELOG.md
 # Set specific image tags in compose files
 #
 
-sed -i "" -e "s/latest/${VERSION}/" *.yml
+sed -i "" -e "s/unstable/${VERSION}/" *.yml
 
 # Commit all changes and tag the repo
 #
@@ -58,12 +58,12 @@ git tag -a "${VERSION}" -m "release" -m "${CHANGES}"
 
 JITSI_BUILD=${VERSION} make release
 
-# Revert back to "latest" for development
+# Revert back to "unstable" for development
 #
 
-sed -i "" -e "s/${VERSION}/latest/" *.yml
+sed -i "" -e "s/${VERSION}/unstable/" *.yml
 
-git commit -a -m "misc: working on latest"
+git commit -a -m "misc: working on unstable"
 
 # Push all changes and tags
 #