diff options
author | Harald Welte <laforge@gnumonks.org> | 2019-05-21 17:51:49 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2019-05-21 17:53:11 +0200 |
commit | 06ac6e455e0b54863972e8a7ba9707e3e56a87f2 (patch) | |
tree | 2b1656f9fe1b945568720789f86ccb766b696e03 /ttcn3-mgw-test | |
parent | 73663b01f21e9a01cf3e5048d802270c482852cf (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 'ttcn3-mgw-test')
-rw-r--r-- | ttcn3-mgw-test/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index d6267e8..bf13d12 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -5,7 +5,7 @@ RUN mkdir /root/projects && (cd /root/projects && ln -sf / git) RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git RUN cd osmo-ttcn3-hacks && \ - git checkout -f master && \ + git checkout -f -B master origin/master && \ make deps ARG OSMO_TTCN3_BRANCH="master" @@ -13,7 +13,7 @@ ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit RUN cd osmo-ttcn3-hacks && \ git fetch && \ - git checkout -f $OSMO_TTCN3_BRANCH && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \ make mgw |