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
This commit is contained in:
parent
db3f98113c
commit
61fed0ad39
|
@ -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 && \
|
dpkg -i ./libfftranscode0_0.3_${DPKG_ARCH}.deb ./libfftranscode-dev_0.3_${DPKG_ARCH}.deb && \
|
||||||
apt install --fix-broken && \
|
apt install --fix-broken && \
|
||||||
rm libfftranscode*.deb
|
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
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,12 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,12 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,12 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
|
@ -1,15 +1,5 @@
|
||||||
ARG USER
|
ARG USER
|
||||||
FROM $USER/debian-stretch-titan
|
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"
|
ARG OSMO_TTCN3_BRANCH="master"
|
||||||
|
|
||||||
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
ADD http://git.osmocom.org/osmo-ttcn3-hacks/patch?h=$OSMO_TTCN3_BRANCH /tmp/commit
|
||||||
|
|
Loading…
Reference in New Issue