diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-02-14 21:57:39 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-02-14 21:57:39 +0100 |
| commit | 10305f2f8f001b51129d6839955f94952989d664 (patch) | |
| tree | b5a4623b56398c3f627c290d7d8495d35c5eff03 | |
| parent | f14d94d26b4662b98d2db9aea2805b4938a3ed4d (diff) | |
ttcn3: Add OSMO_TTCN3_BRANCH build-time argument to build non-master branches
| -rw-r--r-- | ggsn-test/Dockerfile | 6 | ||||
| -rw-r--r-- | mgw-test/Dockerfile | 6 | ||||
| -rw-r--r-- | ttcn3-bsc-test/Dockerfile | 6 | ||||
| -rw-r--r-- | ttcn3-msc-test/Dockerfile | 6 | ||||
| -rw-r--r-- | ttcn3-nitb-sysinfo/Dockerfile | 6 |
5 files changed, 20 insertions, 10 deletions
diff --git a/ggsn-test/Dockerfile b/ggsn-test/Dockerfile index 412ba59..5a29922 100644 --- a/ggsn-test/Dockerfile +++ b/ggsn-test/Dockerfile @@ -6,10 +6,12 @@ RUN cd osmo-ttcn3-hacks && \ git checkout -f -B master origin/master && \ make deps -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit +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 -B master origin/master && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ make ggsn_tests VOLUME /data diff --git a/mgw-test/Dockerfile b/mgw-test/Dockerfile index 4015d99..2603ee6 100644 --- a/mgw-test/Dockerfile +++ b/mgw-test/Dockerfile @@ -7,10 +7,12 @@ RUN cd osmo-ttcn3-hacks && \ git checkout -f -B master origin/master && \ make deps -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit +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 -B master origin/master && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ make mgw VOLUME /data diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index acb38ce..4ce55b8 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -10,10 +10,12 @@ RUN cd osmo-ttcn3-hacks && \ RUN git config --global user.email docker@dock.er && \ git config --global user.name "Dock Er" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit +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 -B master origin/master && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ make bsc diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index 7252443..e9b3cf6 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -10,10 +10,12 @@ RUN cd osmo-ttcn3-hacks && \ RUN git config --global user.email docker@dock.er && \ git config --global user.name "Dock Er" -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit +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 -B master origin/master && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ git cherry-pick 5ce5241d6d460e9b36a908ac7072d8ea68df08db && \ make msc diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index b7921ac..89be2e0 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -7,10 +7,12 @@ RUN cd osmo-ttcn3-hacks && \ git checkout -f -B master origin/master && \ make deps -ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch /tmp/commit +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 -B master origin/master && \ + git checkout -f -B $OSMO_TTCN3_BRANCH origin/$OSMO_TTCN3_BRANCH && \ make sysinfo VOLUME /data |