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
This commit is contained in:
5
Makefile
5
Makefile
@@ -1,6 +1,6 @@
|
|||||||
FORCE_REBUILD ?= 0
|
FORCE_REBUILD ?= 0
|
||||||
JITSI_RELEASE ?= stable
|
JITSI_RELEASE ?= stable
|
||||||
JITSI_BUILD ?= latest
|
JITSI_BUILD ?= unstable
|
||||||
JITSI_REPO ?= jitsi
|
JITSI_REPO ?= jitsi
|
||||||
NATIVE_ARCH ?= $(shell uname -m)
|
NATIVE_ARCH ?= $(shell uname -m)
|
||||||
|
|
||||||
@@ -43,10 +43,9 @@ $(addprefix build_,$(JITSI_SERVICES)):
|
|||||||
$(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build
|
$(MAKE) --no-print-directory JITSI_SERVICE=$(patsubst build_%,%,$@) build
|
||||||
|
|
||||||
tag:
|
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:
|
push:
|
||||||
docker push $(JITSI_REPO)/$(JITSI_SERVICE):latest
|
|
||||||
docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
|
docker push $(JITSI_REPO)/$(JITSI_SERVICE):$(JITSI_BUILD)
|
||||||
|
|
||||||
%-all:
|
%-all:
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ version: '3'
|
|||||||
services:
|
services:
|
||||||
# Frontend
|
# Frontend
|
||||||
web:
|
web:
|
||||||
image: jitsi/web:latest
|
image: jitsi/web:unstable
|
||||||
restart: ${RESTART_POLICY}
|
restart: ${RESTART_POLICY}
|
||||||
ports:
|
ports:
|
||||||
- '${HTTP_PORT}:80'
|
- '${HTTP_PORT}:80'
|
||||||
@@ -139,7 +139,7 @@ services:
|
|||||||
|
|
||||||
# XMPP server
|
# XMPP server
|
||||||
prosody:
|
prosody:
|
||||||
image: jitsi/prosody:latest
|
image: jitsi/prosody:unstable
|
||||||
restart: ${RESTART_POLICY}
|
restart: ${RESTART_POLICY}
|
||||||
expose:
|
expose:
|
||||||
- '${XMPP_PORT:-5222}'
|
- '${XMPP_PORT:-5222}'
|
||||||
@@ -221,7 +221,7 @@ services:
|
|||||||
|
|
||||||
# Focus component
|
# Focus component
|
||||||
jicofo:
|
jicofo:
|
||||||
image: jitsi/jicofo:latest
|
image: jitsi/jicofo:unstable
|
||||||
restart: ${RESTART_POLICY}
|
restart: ${RESTART_POLICY}
|
||||||
volumes:
|
volumes:
|
||||||
- ${CONFIG}/jicofo:/config:Z
|
- ${CONFIG}/jicofo:/config:Z
|
||||||
@@ -273,7 +273,7 @@ services:
|
|||||||
|
|
||||||
# Video bridge
|
# Video bridge
|
||||||
jvb:
|
jvb:
|
||||||
image: jitsi/jvb:latest
|
image: jitsi/jvb:unstable
|
||||||
restart: ${RESTART_POLICY}
|
restart: ${RESTART_POLICY}
|
||||||
ports:
|
ports:
|
||||||
- '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
|
- '${JVB_PORT:-10000}:${JVB_PORT:-10000}/udp'
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ version: '3'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
jibri:
|
jibri:
|
||||||
image: jitsi/jibri:latest
|
image: jitsi/jibri:unstable
|
||||||
restart: ${RESTART_POLICY}
|
restart: ${RESTART_POLICY}
|
||||||
volumes:
|
volumes:
|
||||||
- ${CONFIG}/jibri:/config:Z
|
- ${CONFIG}/jibri:/config:Z
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ version: '3'
|
|||||||
services:
|
services:
|
||||||
# SIP gateway (audio)
|
# SIP gateway (audio)
|
||||||
jigasi:
|
jigasi:
|
||||||
image: jitsi/jigasi:latest
|
image: jitsi/jigasi:unstable
|
||||||
restart: ${RESTART_POLICY}
|
restart: ${RESTART_POLICY}
|
||||||
ports:
|
ports:
|
||||||
- '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'
|
- '${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}:${JIGASI_PORT_MIN:-20000}-${JIGASI_PORT_MAX:-20050}/udp'
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ mv tmp CHANGELOG.md
|
|||||||
# Set specific image tags in compose files
|
# 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
|
# Commit all changes and tag the repo
|
||||||
#
|
#
|
||||||
@@ -58,12 +58,12 @@ git tag -a "${VERSION}" -m "release" -m "${CHANGES}"
|
|||||||
|
|
||||||
JITSI_BUILD=${VERSION} make release
|
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
|
# Push all changes and tags
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user