diff options
| author | Daniel Willmann <dwillmann@sysmocom.de> | 2019-04-25 13:56:14 +0200 |
|---|---|---|
| committer | Daniel Willmann <dwillmann@sysmocom.de> | 2019-04-25 13:56:14 +0200 |
| commit | b59a9ed8d4d00eab4193caa46a1f24d280478b96 (patch) | |
| tree | dbf43cb07bac0ce5cbaf9cb5985974e91252d3c2 /osmo-sip-master | |
| parent | a7deb5d7a851fe0342e4377604b338a5e86ee1c8 (diff) | |
Add OSMO_*_BRANCH environment variables for build args
Previously we could only set OSMO_TTCN3_BRANCH as environment variable
to build a test other than master.
This patch adds environment variables for all osmo-*-master images which
allow docker tests to be executed for an arbitrary commit.
The origin/ prefix from the git checkout command is removed so the
*_BRANCH variable doesn't have to contain branch names, but van also
contain arbitrary commits. This shouldn't have any adverse effect as we
only have one remote in the checkout.
Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869
Diffstat (limited to 'osmo-sip-master')
| -rw-r--r-- | osmo-sip-master/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 5854221..258b1fe 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -36,7 +36,7 @@ RUN git clone git://git.osmocom.org/osmo-sip-connector.git ADD http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector RUN cd osmo-sip-connector && \ - git fetch && git checkout -f -B $OSMO_SIP_BRANCH origin/$OSMO_SIP_BRANCH && \ + git fetch && git checkout -f -B $OSMO_SIP_BRANCH $OSMO_SIP_BRANCH && \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ autoreconf -fi && \ ./configure --enable-smpp --enable-iu && \ |