pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/38439?usp=email )

Change subject: make/Makefile: Update git branch references for asterisk and pjproject ......................................................................

make/Makefile: Update git branch references for asterisk and pjproject

The branches were modified a while ago to point to a development branch while in heavy development phase. The work has been merged into feature branches now, so move to those now that bulk of work is done.

Change-Id: I28e86f8d9ce5d46e1a891f83ec365ac9ca4e289f --- M make/Makefile 1 file changed, 2 insertions(+), 2 deletions(-)

Approvals: jolly: Looks good to me, approved Jenkins Builder: Verified

diff --git a/make/Makefile b/make/Makefile index 4ee4525..c39f2a8 100644 --- a/make/Makefile +++ b/make/Makefile @@ -17,7 +17,7 @@ USERNAME?=$(USER) UID=$(shell id -u) NAME?=$(shell basename $(CURDIR)) -ASTERISK_BRANCH?=jolly/work +ASTERISK_BRANCH?=sysmocom/20.7.0 LIBOSMOCORE_BRANCH?=master OSMO_TTCN3_BRANCH?=master OSMO_BB_BRANCH?=master @@ -42,7 +42,7 @@ OSMO_STP_BRANCH?=master OSMO_UECUPS_BRANCH?=master OPEN5GS_BRANCH?=main -PJPROJECT_BRANCH?=jolly/work +PJPROJECT_BRANCH?=sysmocom/2.14 BUILD_ARGS?= RUN_ARGS?=-it UPSTREAM_DISTRO?=debian:bookworm