From 61fed0ad3959b0b5d841bad9d99217a20cb9ffaa Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Wed, 10 Feb 2021 14:14:55 +0100 Subject: [PATCH] ttcn3: move initial clone to debian-stretch-titan Clone the osmo-ttcn3-hacks and all dependency repositories less often by moving related commands to the shared debian-stretch-titan image. Remove the 'git checkout -f -B master origin/master' line, because the master branch is checked out by default. While at it, move the shared "git config" commands too, and move them before cloning the repositories, so they don't run again whenever the deps change (logic to invalidate the cache if deps change will be added in the next patch). Related: OS#5017 Change-Id: I2bb142dce061eba4b6a828c4e435510e309989fd --- debian-stretch-titan/Dockerfile | 7 +++++++ ttcn3-bsc-test/Dockerfile | 10 ---------- ttcn3-bscnat-test/Dockerfile | 10 ---------- ttcn3-bts-test/Dockerfile | 10 ---------- ttcn3-fr-test/Dockerfile | 10 ---------- ttcn3-gbproxy-test/Dockerfile | 10 ---------- ttcn3-ggsn-test/Dockerfile | 7 ------- ttcn3-hlr-test/Dockerfile | 10 ---------- ttcn3-mgw-test/Dockerfile | 7 ------- ttcn3-msc-test/Dockerfile | 10 ---------- ttcn3-nitb-sysinfo/Dockerfile | 7 ------- ttcn3-pcu-test/Dockerfile | 10 ---------- ttcn3-remsim-test/Dockerfile | 10 ---------- ttcn3-sccp-test/Dockerfile | 10 ---------- ttcn3-sgsn-test/Dockerfile | 10 ---------- ttcn3-sip-test/Dockerfile | 10 ---------- ttcn3-smlc-test/Dockerfile | 10 ---------- ttcn3-stp-test/Dockerfile | 10 ---------- 18 files changed, 7 insertions(+), 161 deletions(-) diff --git a/debian-stretch-titan/Dockerfile b/debian-stretch-titan/Dockerfile index 74bc420c..0f4f17e2 100644 --- a/debian-stretch-titan/Dockerfile +++ b/debian-stretch-titan/Dockerfile @@ -48,3 +48,10 @@ RUN DPKG_ARCH="$(dpkg --print-architecture)" && export $DPKG_ARCH && \ dpkg -i ./libfftranscode0_0.3_${DPKG_ARCH}.deb ./libfftranscode-dev_0.3_${DPKG_ARCH}.deb && \ apt install --fix-broken && \ rm libfftranscode*.deb + +RUN git config --global user.email docker@dock.er && \ + git config --global user.name "Dock Er" + +# clone osmo-ttcn3-hacks and deps +RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git && \ + make -C /osmo-ttcn3-hacks deps diff --git a/ttcn3-bsc-test/Dockerfile b/ttcn3-bsc-test/Dockerfile index 8bdf87f4..c26247da 100644 --- a/ttcn3-bsc-test/Dockerfile +++ b/ttcn3-bsc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bscnat-test/Dockerfile b/ttcn3-bscnat-test/Dockerfile index 84928a7e..dcf66d23 100644 --- a/ttcn3-bscnat-test/Dockerfile +++ b/ttcn3-bscnat-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-bts-test/Dockerfile b/ttcn3-bts-test/Dockerfile index 30704cf5..48909aac 100644 --- a/ttcn3-bts-test/Dockerfile +++ b/ttcn3-bts-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-fr-test/Dockerfile b/ttcn3-fr-test/Dockerfile index 7b805045..39418950 100644 --- a/ttcn3-fr-test/Dockerfile +++ b/ttcn3-fr-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-gbproxy-test/Dockerfile b/ttcn3-gbproxy-test/Dockerfile index 4e0c66f9..2acd1036 100644 --- a/ttcn3-gbproxy-test/Dockerfile +++ b/ttcn3-gbproxy-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-ggsn-test/Dockerfile b/ttcn3-ggsn-test/Dockerfile index 7e88f285..1d537473 100644 --- a/ttcn3-ggsn-test/Dockerfile +++ b/ttcn3-ggsn-test/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-hlr-test/Dockerfile b/ttcn3-hlr-test/Dockerfile index 78ff0ce3..20e15975 100644 --- a/ttcn3-hlr-test/Dockerfile +++ b/ttcn3-hlr-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-mgw-test/Dockerfile b/ttcn3-mgw-test/Dockerfile index 9afef2eb..6580e926 100644 --- a/ttcn3-mgw-test/Dockerfile +++ b/ttcn3-mgw-test/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-msc-test/Dockerfile b/ttcn3-msc-test/Dockerfile index db73c8e1..bb04c10b 100644 --- a/ttcn3-msc-test/Dockerfile +++ b/ttcn3-msc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-nitb-sysinfo/Dockerfile b/ttcn3-nitb-sysinfo/Dockerfile index 44424b33..27a3e23c 100644 --- a/ttcn3-nitb-sysinfo/Dockerfile +++ b/ttcn3-nitb-sysinfo/Dockerfile @@ -1,12 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-pcu-test/Dockerfile b/ttcn3-pcu-test/Dockerfile index 2f3deff6..c3606bb9 100644 --- a/ttcn3-pcu-test/Dockerfile +++ b/ttcn3-pcu-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-remsim-test/Dockerfile b/ttcn3-remsim-test/Dockerfile index 3a2d14e0..594dcb6a 100644 --- a/ttcn3-remsim-test/Dockerfile +++ b/ttcn3-remsim-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sccp-test/Dockerfile b/ttcn3-sccp-test/Dockerfile index 901200ac..d9061065 100644 --- a/ttcn3-sccp-test/Dockerfile +++ b/ttcn3-sccp-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sgsn-test/Dockerfile b/ttcn3-sgsn-test/Dockerfile index 9b1c540f..e3babb73 100644 --- a/ttcn3-sgsn-test/Dockerfile +++ b/ttcn3-sgsn-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-sip-test/Dockerfile b/ttcn3-sip-test/Dockerfile index 0828e081..5b3044ce 100644 --- a/ttcn3-sip-test/Dockerfile +++ b/ttcn3-sip-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-smlc-test/Dockerfile b/ttcn3-smlc-test/Dockerfile index 3ffecb99..88a4dfc8 100644 --- a/ttcn3-smlc-test/Dockerfile +++ b/ttcn3-smlc-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit diff --git a/ttcn3-stp-test/Dockerfile b/ttcn3-stp-test/Dockerfile index 532da9f7..55ccf01a 100644 --- a/ttcn3-stp-test/Dockerfile +++ b/ttcn3-stp-test/Dockerfile @@ -1,15 +1,5 @@ ARG USER FROM $USER/debian-stretch-titan - -RUN git clone git://git.osmocom.org/osmo-ttcn3-hacks.git - -RUN cd osmo-ttcn3-hacks && \ - git checkout -f -B master origin/master && \ - make deps - -RUN git config --global user.email docker@dock.er && \ - git config --global user.name "Dock Er" - ARG OSMO_TTCN3_BRANCH="master" ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit