aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2020-01-16 14:26:35 +0100
committerPau Espin Pedrol <pespin@sysmocom.de>2020-01-16 14:26:35 +0100
commit259fd3cedf81c7dd1d8b74e9d3c3cca517b46f1e (patch)
treec177192ad5d24780c0157b256596406d1135183f
parente8ec219ba2cd694f1469d6d3129cb1ad9cc87afc (diff)
ttcn3-stp: Set default OSMO_TTCN3_BRANCH to master
-rw-r--r--ttcn3-stp-test/Dockerfile4
1 files changed, 1 insertions, 3 deletions
diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile
index a755c94..e6bb9d0 100644
--- a/ttcn3-stp-test/Dockerfile
+++ b/ttcn3-stp-test/Dockerfile
@@ -11,9 +11,7 @@ RUN cd osmo-ttcn3-hacks && \
RUN git config --global user.email docker@dock.er && \
git config --global user.name "Dock Er"
-# FIXME: Once STP patches in laforge/stp are merged into master, then
-# OSMO_TTCN3_BRANCH can be set again to "master".
-ARG OSMO_TTCN3_BRANCH="laforge/stp"
+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 && \