*/Dockerfile: clone from gerrit.osmocom.org using https://

* Do not clone using deprecated git://, use https:// instead.
* Clone from the main repo gerrit.osmocom.org (if possible).
* Use the gitiles plugin to fetch the last commit from Gerrit.

Change-Id: I204fa6e3e3ebbdb8732393b897fca35659d61ae8
This commit is contained in:
Vadim Yanitskiy 2023-01-06 23:01:40 +07:00
parent aa27022cf8
commit ea90e44ab0
27 changed files with 59 additions and 56 deletions

View File

@ -39,13 +39,13 @@ RUN chown build:build /build
ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH}
# Install osmo-ci.git/scripts to /usr/local/bin
ADD http://git.osmocom.org/osmo-ci/patch /tmp/osmo-ci-commit
RUN git clone https://git.osmocom.org/osmo-ci osmo-ci && \
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ci/+/master?format=TEXT /tmp/osmo-ci-commit
RUN git clone https://gerrit.osmocom.org/osmo-ci.git && \
cp -v $(find osmo-ci/scripts \
-maxdepth 1 \
-type f ) \
/usr/local/bin
# Install osmo-gsm-manuals to /opt/osmo-gsm-manuals
ADD http://git.osmocom.org/osmo-gsm-manuals/patch /tmp/osmo-gsm-manuals-commit
RUN git -C /opt clone https://git.osmocom.org/osmo-gsm-manuals
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gsm-manuals/+/master?format=TEXT /tmp/osmo-gsm-manuals-commit
RUN git -C /opt clone https://gerrit.osmocom.org/osmo-gsm-manuals

View File

@ -13,8 +13,8 @@ RUN apt-get update && \
ARG GR_GSM_BRANCH="master"
RUN git clone git://git.osmocom.org/gr-gsm
ADD http://git.osmocom.org/gr-gsm/patch?h=$GR_GSM_BRANCH /tmp/commit-gr-gsm
RUN git clone https://gerrit.osmocom.org/gr-gsm
ADD https://gerrit.osmocom.org/plugins/gitiles/gr-gsm/+/$GR_GSM_BRANCH?format=TEXT /tmp/commit-gr-gsm
RUN cd gr-gsm \
&& git fetch && git checkout -f -B $GR_GSM_BRANCH origin/$GR_GSM_BRANCH \

View File

@ -2,7 +2,7 @@ ARG USER=osmocom-build
FROM $USER/sigtran-tests
RUN cd /tmp && git clone git://git.osmocom.org/nplab/m3ua-testtool
RUN cd /tmp && git clone https://git.osmocom.org/nplab/m3ua-testtool
ADD http://git.osmocom.org/nplab/m3ua-testtool/patch/?h=laforge/python3 /tmp/commit
RUN cd /tmp/m3ua-testtool && \
git fetch && \

View File

@ -2,7 +2,7 @@ ARG USER=osmocom-build
FROM $USER/sigtran-tests
RUN cd /tmp && git clone git://git.osmocom.org/nplab/sua-testtool
RUN cd /tmp && git clone https://git.osmocom.org/nplab/sua-testtool
ADD http://git.osmocom.org/nplab/sua-testtool/patch/?h=laforge/python3 /tmp/commit
RUN cd /tmp/sua-testtool && \
git fetch && \

View File

@ -36,8 +36,8 @@ WORKDIR /tmp
ARG OSMO_BSC_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-bsc.git
ADD http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc
RUN git clone https://gerrit.osmocom.org/osmo-bsc.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-bsc/+/$OSMO_BSC_BRANCH?format=TEXT /tmp/commit-osmo-bsc
RUN cd osmo-bsc && \
git fetch && git checkout $OSMO_BSC_BRANCH && \

View File

@ -35,8 +35,8 @@ WORKDIR /tmp
ARG OSMO_BTS_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-bts.git
ADD http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts
RUN git clone https://gerrit.osmocom.org/osmo-bts.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-bts/+/$OSMO_BTS_BRANCH?format=TEXT /tmp/commit-osmo-bts
RUN cd osmo-bts && \
git fetch && git checkout $OSMO_BTS_BRANCH && \

View File

@ -29,8 +29,8 @@ WORKDIR /tmp
ARG OSMO_CBC_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-cbc.git
ADD http://git.osmocom.org/osmo-cbc/patch?h=$OSMO_CBC_BRANCH /tmp/commit-osmo-cbc
RUN git clone https://gerrit.osmocom.org/osmo-cbc.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-cbc/+/$OSMO_CBC_BRANCH?format=TEXT /tmp/commit-osmo-cbc
RUN cd osmo-cbc && \
git fetch && git checkout $OSMO_CBC_BRANCH && \

View File

@ -3,12 +3,13 @@ FROM neels/debian-sid-build
WORKDIR /build
ADD http://git.osmocom.org/osmo-dev/patch /build/commit-osmo-dev
RUN git clone git://git.osmocom.org/osmo-dev.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-dev/+/master?format=TEXT /build/commit-osmo-dev
RUN git clone https://gerrit.osmocom.org/osmo-dev.git
RUN cd osmo-dev && \
./gen_makefile.py 3G+2G.deps default.opts iu.opts -m make --ldconfig-without-sudo
# Not using gitiles plugin here because gen_makefile.py clones from git.osmocom.org
ADD http://git.osmocom.org/libosmocore/patch /build/commit-libosmocore
ADD http://git.osmocom.org/libosmo-abis/patch /build/commit-libosmo-abis
ADD http://git.osmocom.org/libosmo-netif/patch /build/commit-libosmo-netif

View File

@ -30,8 +30,8 @@ WORKDIR /tmp
ARG OSMO_GBPROXY_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-gbproxy.git
ADD http://git.osmocom.org/osmo-gbproxy/patch?h=$OSMO_GBPROXY_BRANCH /tmp/commit
RUN git clone https://gerrit.osmocom.org/osmo-gbproxy.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-gbproxy/+/$OSMO_GBPROXY_BRANCH?format=TEXT /tmp/commit-osmo-gbproxy
RUN cd osmo-gbproxy && \
git fetch && git checkout $OSMO_GBPROXY_BRANCH && \

View File

@ -37,8 +37,9 @@ WORKDIR /tmp
ARG OSMO_GGSN_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-ggsn.git
ADD http://git.osmocom.org/osmo-ggsn/patch/?h=$OSMO_GGSN_BRANCH /tmp/commit
RUN git clone https://gerrit.osmocom.org/osmo-ggsn.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-ggsn/+/$OSMO_GGSN_BRANCH?format=TEXT /tmp/commit-osmo-ggsn
RUN cd osmo-ggsn && \
git fetch && git checkout $OSMO_GGSN_BRANCH && \
(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_GGSN_BRANCH || exit 1); \

View File

@ -31,8 +31,8 @@ WORKDIR /tmp
ARG OSMO_HLR_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-hlr.git
ADD http://git.osmocom.org/osmo-hlr/patch?h=$OSMO_HLR_BRANCH /tmp/commit-osmo-hlr
RUN git clone https://gerrit.osmocom.org/osmo-hlr.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-hlr/+/$OSMO_HLR_BRANCH?format=TEXT /tmp/commit-osmo-hlr
RUN cd osmo-hlr && \
git fetch && git checkout $OSMO_HLR_BRANCH && \

View File

@ -23,8 +23,8 @@ WORKDIR /tmp
ARG OSMO_HNBGW_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-hnbgw.git
ADD http://git.osmocom.org/osmo-hnbgw/patch?h=$OSMO_HNBGW_BRANCH /tmp/commit-osmo-hnbgw
RUN git clone https://gerrit.osmocom.org/osmo-hnbgw.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-hnbgw/+/$OSMO_HNBGW_BRANCH?format=TEXT /tmp/commit-osmo-hnbgw
RUN cd osmo-hnbgw && \
git fetch && git checkout $OSMO_HNBGW_BRANCH && \

View File

@ -17,8 +17,8 @@ WORKDIR /tmp
ARG OSMO_IUH_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-iuh.git
ADD http://git.osmocom.org/osmo-iuh/patch?h=$OSMO_IUH_BRANCH /tmp/commit-osmo-iuh
RUN git clone https://gerrit.osmocom.org/osmo-iuh.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-iuh/+/$OSMO_IUH_BRANCH?format=TEXT /tmp/commit-osmo-iuh
RUN cd osmo-iuh && \
git fetch && git checkout $OSMO_IUH_BRANCH && \
@ -31,8 +31,8 @@ RUN cd osmo-iuh && \
ARG OSMO_HNODEB_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-hnodeb.git
ADD http://git.osmocom.org/osmo-hnodeb/patch?h=$OSMO_HNODEB_BRANCH /tmp/commit-osmo-hnodeb
RUN git clone https://gerrit.osmocom.org/osmo-hnodeb.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-hnodeb/+/$OSMO_HNODEB_BRANCH?format=TEXT /tmp/commit-osmo-hnodeb
RUN cd osmo-hnodeb && \
git fetch && git checkout $OSMO_HNODEB_BRANCH && \

View File

@ -31,8 +31,8 @@ WORKDIR /tmp
ARG OSMO_MGW_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-mgw.git
ADD http://git.osmocom.org/osmo-mgw/patch?h=$OSMO_MGW_BRANCH /tmp/commit-osmo-mgw
RUN git clone https://gerrit.osmocom.org/osmo-mgw.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-mgw/+/$OSMO_MGW_BRANCH?format=TEXT /tmp/commit-osmo-mgw
RUN cd osmo-mgw && \

View File

@ -44,8 +44,8 @@ WORKDIR /tmp
ARG OSMO_MSC_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-msc.git
ADD http://git.osmocom.org/osmo-msc/patch?h=$OSMO_MSC_BRANCH /tmp/commit-osmo-msc
RUN git clone https://gerrit.osmocom.org/osmo-msc.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-msc/+/$OSMO_MSC_BRANCH?format=TEXT /tmp/commit-osmo-msc
RUN cd osmo-msc && \
git fetch && git checkout $OSMO_MSC_BRANCH && \

View File

@ -18,8 +18,8 @@ WORKDIR /tmp
ARG OSMO_NITB_BRANCH="master"
RUN git clone git://git.osmocom.org/openbsc.git
ADD http://git.osmocom.org/openbsc/patch?h=$OSMO_NITB_BRANCH /tmp/commit-openbsc
RUN git clone https://gerrit.osmocom.org/openbsc.git
ADD https://gerrit.osmocom.org/plugins/gitiles/openbsc/+/$OSMO_NITB_BRANCH?format=TEXT /tmp/commit-openbsc
RUN cd openbsc/openbsc && \
git fetch && git checkout $OSMO_NITB_BRANCH && \

View File

@ -22,8 +22,8 @@ WORKDIR /tmp
ARG LIBOSMOCORE_BRANCH="master"
RUN git clone git://git.osmocom.org/libosmocore.git
ADD http://git.osmocom.org/libosmocore/patch?h=$LIBOSMOCORE_BRANCH /tmp/commit-libosmocore
RUN git clone https://gerrit.osmocom.org/libosmocore.git
ADD https://gerrit.osmocom.org/plugins/gitiles/libosmocore/+/$LIBOSMOCORE_BRANCH?format=TEXT /tmp/commit-libosmocore
RUN cd libosmocore && \
git fetch && git checkout $LIBOSMOCORE_BRANCH && \

View File

@ -28,8 +28,8 @@ WORKDIR /tmp
ARG OSMO_PCAP_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-pcap.git
ADD http://git.osmocom.org/osmo-pcap/patch?h=$OSMO_PCAP_BRANCH /tmp/commit-osmo-pcap
RUN git clone https://gerrit.osmocom.org/osmo-pcap.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-pcap/+/$OSMO_PCAP_BRANCH?format=TEXT /tmp/commit-osmo-pcap
RUN cd osmo-pcap && \
git fetch && git checkout $OSMO_PCAP_BRANCH && \

View File

@ -25,8 +25,8 @@ WORKDIR /tmp
ARG OSMO_PCU_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-pcu.git
ADD http://git.osmocom.org/osmo-pcu/patch?h=$OSMO_PCU_BRANCH /tmp/commit-osmo-pcu
RUN git clone https://gerrit.osmocom.org/osmo-pcu.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-pcu/+/$OSMO_PCU_BRANCH?format=TEXT /tmp/commit-osmo-pcu
RUN cd osmo-pcu && \
git fetch && git checkout $OSMO_PCU_BRANCH && \

View File

@ -65,8 +65,8 @@ WORKDIR /tmp
ARG OSMO_REMSIM_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-remsim.git
ADD http://git.osmocom.org/osmo-remsim/patch?h=$OSMO_REMSIM_BRANCH /tmp/commit-osmo-remsim
RUN git clone https://gerrit.osmocom.org/osmo-remsim.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-remsim/+/$OSMO_REMSIM_BRANCH?format=TEXT /tmp/commit-osmo-remsim
RUN cd osmo-remsim && \
git fetch && git checkout $OSMO_REMSIM_BRANCH && \

View File

@ -42,8 +42,8 @@ WORKDIR /tmp
ARG OSMO_SGSN_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-sgsn.git
ADD http://git.osmocom.org/osmo-sgsn/patch?h=$OSMO_SGSN_BRANCH /tmp/commit
RUN git clone https://gerrit.osmocom.org/osmo-sgsn.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-sgsn/+/$OSMO_SGSN_BRANCH?format=TEXT /tmp/commit-osmo-sgsn
RUN cd osmo-sgsn && \
git fetch && git checkout $OSMO_SGSN_BRANCH && \

View File

@ -25,8 +25,8 @@ WORKDIR /tmp
ARG OSMO_SIP_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-sip-connector.git
ADD http://git.osmocom.org/osmo-sip-connector/patch?h=$OSMO_SIP_BRANCH /tmp/commit-osmo-sip-connector
RUN git clone https://gerrit.osmocom.org/osmo-sip-connector.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-sip-connector/+/$OSMO_SIP_BRANCH?format=TEXT /tmp/commit-osmo-sip-connector
RUN cd osmo-sip-connector && \
git fetch && git checkout $OSMO_SIP_BRANCH && \

View File

@ -30,8 +30,8 @@ WORKDIR /tmp
ARG OSMO_SMLC_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-smlc.git
ADD http://git.osmocom.org/osmo-smlc/patch?h=$OSMO_SMLC_BRANCH /tmp/commit-osmo-smlc
RUN git clone https://gerrit.osmocom.org/osmo-smlc.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-smlc/+/$OSMO_SMLC_BRANCH?format=TEXT /tmp/commit-osmo-smlc
RUN cd osmo-smlc && \
git fetch && git checkout $OSMO_SMLC_BRANCH && \

View File

@ -25,8 +25,9 @@ WORKDIR /data
ARG OSMO_STP_BRANCH="master"
RUN git clone git://git.osmocom.org/libosmo-sccp.git
ADD http://git.osmocom.org/libosmo-sccp/patch?h=$OSMO_STP_BRANCH /tmp/commit
RUN git clone https://gerrit.osmocom.org/libosmo-sccp.git
ADD https://gerrit.osmocom.org/plugins/gitiles/libosmo-sccp/+/$OSMO_STP_BRANCH?format=TEXT /tmp/commit-libosmo-sccp
RUN cd libosmo-sccp && \
git fetch && git checkout $OSMO_STP_BRANCH && \
(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_STP_BRANCH || exit 1); \

View File

@ -19,8 +19,8 @@ WORKDIR /tmp
ARG OSMO_UECUPS_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-uecups.git
ADD http://git.osmocom.org/osmo-uecups/patch?h=$OSMO_UECUPS_BRANCH /tmp/commit-osmo-uecups
RUN git clone https://gerrit.osmocom.org/osmo-uecups.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-uecups/+/$OSMO_UECUPS_BRANCH?format=TEXT /tmp/commit-osmo-uecups
RUN cd osmo-uecups && \
git fetch && git checkout $OSMO_UECUPS_BRANCH && \

View File

@ -29,8 +29,8 @@ WORKDIR /tmp
ARG OSMO_UPF_BRANCH="master"
RUN git clone git://git.osmocom.org/osmo-upf.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-upf/+/refs/heads/$OSMO_UPF_BRANCH /tmp/commit-osmo-upf
RUN git clone https://gerrit.osmocom.org/osmo-upf.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmo-upf/+/$OSMO_UPF_BRANCH?format=TEXT /tmp/commit-osmo-upf
RUN cd osmo-upf && \
git fetch && git checkout $OSMO_UPF_BRANCH && \

View File

@ -12,9 +12,9 @@ RUN apt-get update && \
WORKDIR /tmp
RUN git clone git://git.osmocom.org/osmocom-bb.git
RUN git clone https://gerrit.osmocom.org/osmocom-bb.git
ADD https://gerrit.osmocom.org/plugins/gitiles/osmocom-bb/+/$OSMO_BB_BRANCH?format=TEXT /tmp/commit-osmocom-bb
ADD http://git.osmocom.org/osmocom-bb/patch?h=$OSMO_BB_BRANCH /tmp/commit
RUN cd osmocom-bb && \
git fetch && git checkout $OSMO_BB_BRANCH && \
(git symbolic-ref -q HEAD && git reset --hard origin/$OSMO_BB_BRANCH || exit 1); \