aboutsummaryrefslogtreecommitdiffstats
path: root/osmo-bts-master/Dockerfile
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-05-21 17:51:49 +0200
committerHarald Welte <laforge@gnumonks.org>2019-05-21 17:53:11 +0200
commit06ac6e455e0b54863972e8a7ba9707e3e56a87f2 (patch)
tree2b1656f9fe1b945568720789f86ccb766b696e03 /osmo-bts-master/Dockerfile
parent73663b01f21e9a01cf3e5048d802270c482852cf (diff)
Revert "Simplify git checkout, allow branches and commits"
Unfortuately this commit will check out *local* master (i.e. the previous checkout) rather than the origin/master as it's supposed to be. This means that ever since merging this patch, our ttcn3 tests were running some "undefined" stale versions and not current master. This reverts commit 26565bb729549152ce8fa89f59df02f37c907c27. Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
Diffstat (limited to 'osmo-bts-master/Dockerfile')
-rw-r--r--osmo-bts-master/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile
index d7707a3..f4ddf3a 100644
--- a/osmo-bts-master/Dockerfile
+++ b/osmo-bts-master/Dockerfile
@@ -33,7 +33,7 @@ RUN git clone git://git.osmocom.org/osmo-bts.git
ADD http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts
RUN cd osmo-bts && \
- git fetch && git checkout -f $OSMO_BTS_BRANCH && \
+ git fetch && git checkout -f -B $OSMO_BTS_BRANCH $OSMO_BTS_BRANCH && \
git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
autoreconf -fi && \
./configure --enable-trx && \