pespin has uploaded this change for review.

View Change

WIP: asterisk: Use jolly/work branch

Change-Id: I8ed6401d7389f7498df395f5671864870a7174df
---
M asterisk-master/Dockerfile
1 file changed, 12 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/52/36952/1
diff --git a/asterisk-master/Dockerfile b/asterisk-master/Dockerfile
index 0281176..cf73af5 100644
--- a/asterisk-master/Dockerfile
+++ b/asterisk-master/Dockerfile
@@ -38,7 +38,7 @@

# clone pjproject
ARG PJPROJECT_REMOTE=https://gitea.sysmocom.de/sysmocom/pjproject.git
-ARG PJPROJECT_BRANCH=sysmocom/2.14
+ARG PJPROJECT_BRANCH=jolly/work

RUN git clone $PJPROJECT_REMOTE
ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/pjproject/git/refs/heads/$PJPROJECT_BRANCH /tmp/pjproject-ver
@@ -53,7 +53,7 @@
RUN git clone $ASTERISK_REMOTE

RUN cd asterisk && \
- git fetch && git checkout -f -B sysmocom/master origin/sysmocom/master
+ git fetch && git checkout -f -B jolly/work origin/jolly/work

# Use pjproject from git repo above instead of downloading tar.gz:
RUN cd asterisk/third-party/pjproject && \
@@ -64,7 +64,7 @@
./configure && \
make "-j$(nproc)"

-ARG ASTERISK_BRANCH=sysmocom/master
+ARG ASTERISK_BRANCH=jolly/work

ADD https://gitea.sysmocom.de/api/v1/repos/sysmocom/asterisk/git/refs/heads/$ASTERISK_BRANCH /tmp/asterisk-ver


To view, visit change 36952. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I8ed6401d7389f7498df395f5671864870a7174df
Gerrit-Change-Number: 36952
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-MessageType: newchange