Skip to content

Commit

Permalink
misc: use the "unstable" tag between releases
Browse files Browse the repository at this point in the history
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
  • Loading branch information
saghul committed May 30, 2022
1 parent 741ec4a commit 2a23095
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FORCE_REBUILD ?= 0
JITSI_RELEASE ?= stable
JITSI_BUILD ?= latest
JITSI_BUILD ?= unstable
JITSI_REPO ?= jitsi
NATIVE_ARCH ?= $(shell uname -m)

Expand Down Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:
# Frontend
web:
image: jitsi/web:latest
image: jitsi/web:unstable
restart: ${RESTART_POLICY}
ports:
- '${HTTP_PORT}:80'
Expand Down Expand Up @@ -139,7 +139,7 @@ services:

# XMPP server
prosody:
image: jitsi/prosody:latest
image: jitsi/prosody:unstable
restart: ${RESTART_POLICY}
expose:
- '${XMPP_PORT:-5222}'
Expand Down Expand Up @@ -221,7 +221,7 @@ services:

# Focus component
jicofo:
image: jitsi/jicofo:latest
image: jitsi/jicofo:unstable
restart: ${RESTART_POLICY}
volumes:
- ${CONFIG}/jicofo:/config:Z
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion jibri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: '3'

services:
jibri:
image: jitsi/jibri:latest
image: jitsi/jibri:unstable
restart: ${RESTART_POLICY}
volumes:
- ${CONFIG}/jibri:/config:Z
Expand Down
2 changes: 1 addition & 1 deletion jigasi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand All @@ -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
#
Expand Down

0 comments on commit 2a23095

Please sign in to comment.