aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@osmocom.org>2019-11-13 17:44:04 +0100
committerHarald Welte <laforge@osmocom.org>2019-11-13 17:44:04 +0100
commit49544ac5926845e2adae9436ab8b1f250c733723 (patch)
tree9eb80079be84c677ad0fb1ef2e42454b8f064ecc
parent1569ceb9f457f10065b7b1b55befe7a3b2b53174 (diff)
ttcn3-stp-tests: laforge/stp has been merged master; use master
-rw-r--r--ttcn3-stp-test/Dockerfile3
1 files changed, 0 insertions, 3 deletions
diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile
index 7e671b3..a755c94 100644
--- a/ttcn3-stp-test/Dockerfile
+++ b/ttcn3-stp-test/Dockerfile
@@ -4,11 +4,8 @@ FROM $USER/debian-stretch-titan
RUN mkdir /root/projects && (cd /root/projects && ln -sf / git)
RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git
-# FIXME: Once M3UA dep update patches in laforge/stp is merged into master, the
-# line checking it out can be removed.
RUN cd osmo-ttcn3-hacks && \
git checkout -f -B master origin/master && \
- git fetch && git checkout -f -B laforge/stp origin/laforge/stp && \
make deps
RUN git config --global user.email docker@dock.er && \