From ea90e44ab05e0b332a7754f5c776c1144754aa82 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Fri, 6 Jan 2023 23:01:40 +0700 Subject: [PATCH] */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 --- fpga-build/Dockerfile | 8 ++++---- gr-gsm-master/Dockerfile | 4 ++-- nplab-m3ua-test/Dockerfile | 2 +- nplab-sua-test/Dockerfile | 2 +- osmo-bsc-master/Dockerfile | 4 ++-- osmo-bts-master/Dockerfile | 4 ++-- osmo-cbc-master/Dockerfile | 4 ++-- osmo-dev-on-debian-sid/Dockerfile | 5 +++-- osmo-gbproxy-master/Dockerfile | 4 ++-- osmo-ggsn-master/Dockerfile | 5 +++-- osmo-hlr-master/Dockerfile | 4 ++-- osmo-hnbgw-master/Dockerfile | 4 ++-- osmo-hnodeb-master/Dockerfile | 8 ++++---- osmo-mgw-master/Dockerfile | 4 ++-- osmo-msc-master/Dockerfile | 4 ++-- osmo-nitb-master/Dockerfile | 4 ++-- osmo-ns-master/Dockerfile | 4 ++-- osmo-pcap-master/Dockerfile | 4 ++-- osmo-pcu-master/Dockerfile | 4 ++-- osmo-remsim-master/Dockerfile | 4 ++-- osmo-sgsn-master/Dockerfile | 4 ++-- osmo-sip-master/Dockerfile | 4 ++-- osmo-smlc-master/Dockerfile | 4 ++-- osmo-stp-master/Dockerfile | 5 +++-- osmo-uecups-master/Dockerfile | 4 ++-- osmo-upf-master/Dockerfile | 4 ++-- osmocom-bb-host-master/Dockerfile | 4 ++-- 27 files changed, 59 insertions(+), 56 deletions(-) diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index 6e975a73..1421d297 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -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 diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile index f0e4e979..3301bfda 100644 --- a/gr-gsm-master/Dockerfile +++ b/gr-gsm-master/Dockerfile @@ -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 \ diff --git a/nplab-m3ua-test/Dockerfile b/nplab-m3ua-test/Dockerfile index 1a53329b..2f6ad933 100644 --- a/nplab-m3ua-test/Dockerfile +++ b/nplab-m3ua-test/Dockerfile @@ -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 && \ diff --git a/nplab-sua-test/Dockerfile b/nplab-sua-test/Dockerfile index 931623bc..6bb3ad21 100644 --- a/nplab-sua-test/Dockerfile +++ b/nplab-sua-test/Dockerfile @@ -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 && \ diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile index 32ded302..65ec5d44 100644 --- a/osmo-bsc-master/Dockerfile +++ b/osmo-bsc-master/Dockerfile @@ -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 && \ diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile index 67dd75fc..8c439736 100644 --- a/osmo-bts-master/Dockerfile +++ b/osmo-bts-master/Dockerfile @@ -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 && \ diff --git a/osmo-cbc-master/Dockerfile b/osmo-cbc-master/Dockerfile index a4ec9043..0e90fc80 100644 --- a/osmo-cbc-master/Dockerfile +++ b/osmo-cbc-master/Dockerfile @@ -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 && \ diff --git a/osmo-dev-on-debian-sid/Dockerfile b/osmo-dev-on-debian-sid/Dockerfile index 81ba3cd8..3b2791d1 100644 --- a/osmo-dev-on-debian-sid/Dockerfile +++ b/osmo-dev-on-debian-sid/Dockerfile @@ -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 diff --git a/osmo-gbproxy-master/Dockerfile b/osmo-gbproxy-master/Dockerfile index 3e0e40c4..484bb88c 100644 --- a/osmo-gbproxy-master/Dockerfile +++ b/osmo-gbproxy-master/Dockerfile @@ -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 && \ diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile index 1a4504bb..7f505d01 100644 --- a/osmo-ggsn-master/Dockerfile +++ b/osmo-ggsn-master/Dockerfile @@ -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); \ diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile index 1c3251a5..192c939f 100644 --- a/osmo-hlr-master/Dockerfile +++ b/osmo-hlr-master/Dockerfile @@ -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 && \ diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile index d842fb34..f69a6b45 100644 --- a/osmo-hnbgw-master/Dockerfile +++ b/osmo-hnbgw-master/Dockerfile @@ -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 && \ diff --git a/osmo-hnodeb-master/Dockerfile b/osmo-hnodeb-master/Dockerfile index 1a3ded90..ffdb639d 100644 --- a/osmo-hnodeb-master/Dockerfile +++ b/osmo-hnodeb-master/Dockerfile @@ -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 && \ diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile index dea49515..20b5b1ac 100644 --- a/osmo-mgw-master/Dockerfile +++ b/osmo-mgw-master/Dockerfile @@ -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 && \ diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile index 7d799888..7a0362d1 100644 --- a/osmo-msc-master/Dockerfile +++ b/osmo-msc-master/Dockerfile @@ -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 && \ diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile index 43a8d22e..aa82a5f8 100644 --- a/osmo-nitb-master/Dockerfile +++ b/osmo-nitb-master/Dockerfile @@ -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 && \ diff --git a/osmo-ns-master/Dockerfile b/osmo-ns-master/Dockerfile index 2f88c835..b5164a67 100644 --- a/osmo-ns-master/Dockerfile +++ b/osmo-ns-master/Dockerfile @@ -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 && \ diff --git a/osmo-pcap-master/Dockerfile b/osmo-pcap-master/Dockerfile index eeb210c3..e595bc13 100644 --- a/osmo-pcap-master/Dockerfile +++ b/osmo-pcap-master/Dockerfile @@ -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 && \ diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile index 41cd6d5e..ac0fc1ee 100644 --- a/osmo-pcu-master/Dockerfile +++ b/osmo-pcu-master/Dockerfile @@ -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 && \ diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile index 173f2439..c21bcbb4 100644 --- a/osmo-remsim-master/Dockerfile +++ b/osmo-remsim-master/Dockerfile @@ -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 && \ diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile index 55d96953..edd912fe 100644 --- a/osmo-sgsn-master/Dockerfile +++ b/osmo-sgsn-master/Dockerfile @@ -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 && \ diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile index 3261a55a..71fcf53c 100644 --- a/osmo-sip-master/Dockerfile +++ b/osmo-sip-master/Dockerfile @@ -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 && \ diff --git a/osmo-smlc-master/Dockerfile b/osmo-smlc-master/Dockerfile index b814f7ac..c602268c 100644 --- a/osmo-smlc-master/Dockerfile +++ b/osmo-smlc-master/Dockerfile @@ -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 && \ diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile index 7061e893..2e6ecd6f 100644 --- a/osmo-stp-master/Dockerfile +++ b/osmo-stp-master/Dockerfile @@ -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); \ diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile index 74469e5c..7841b32f 100644 --- a/osmo-uecups-master/Dockerfile +++ b/osmo-uecups-master/Dockerfile @@ -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 && \ diff --git a/osmo-upf-master/Dockerfile b/osmo-upf-master/Dockerfile index 7c5c1e69..97cdd95e 100644 --- a/osmo-upf-master/Dockerfile +++ b/osmo-upf-master/Dockerfile @@ -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 && \ diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile index 21c7f31f..efc99251 100644 --- a/osmocom-bb-host-master/Dockerfile +++ b/osmocom-bb-host-master/Dockerfile @@ -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); \