diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2021-04-30 15:24:00 +0200 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2021-05-04 09:30:48 +0200 |
| commit | 910dacf686824be9ae3a407994c256249760c44e (patch) | |
| tree | 990bf17f47a7855c5db61714817325b8398fa406 /osmo-ran | |
| parent | 84255c7bb860a165878308507443ddf09c0443df (diff) | |
make: add OSMOCOM_REPO_PATH
Allow to change the path between OSMOCOM_REPO_MIRROR and
OSMOCOM_REPO_VERSION. While at it, tweak related comments (comment above
the variable as usually, replace "repo" wording with "feed" for the
latest/nightly variable as we usually refer to it as feed), and mention
OSMOCOM_REPO_* in README.md.
In order to be able to use a different mirror for testsuite and systems
under test, the testsuite related Dockerfiles (osmocom-bb-host-master,
debian-stretch-titan) are not using OSMOCOM_REPO_PATH. We could add a
OSMOCOM_REPO_TESTSUITE_PATH on demand, as mentioned in the next commit.
Related: SYS#5370
Change-Id: I8010a4d49d4620a5c47c2ff4f909a9aeeaad7b73
Diffstat (limited to 'osmo-ran')
| -rw-r--r-- | osmo-ran/Dockerfile | 5 | ||||
| -rw-r--r-- | osmo-ran/split/ran-bsc_mgw/Dockerfile | 5 | ||||
| -rw-r--r-- | osmo-ran/split/ran-bts_pcu/Dockerfile | 5 | ||||
| -rw-r--r-- | osmo-ran/split/ran-trx-ipc/Dockerfile | 5 | ||||
| -rw-r--r-- | osmo-ran/split/ran-trx-uhd/Dockerfile | 5 |
5 files changed, 15 insertions, 10 deletions
diff --git a/osmo-ran/Dockerfile b/osmo-ran/Dockerfile index 5b28b44..61978ed 100644 --- a/osmo-ran/Dockerfile +++ b/osmo-ran/Dockerfile @@ -3,12 +3,13 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de> -ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/" -ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/" +ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" +ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" COPY .common/Release.key /tmp/Release.key diff --git a/osmo-ran/split/ran-bsc_mgw/Dockerfile b/osmo-ran/split/ran-bsc_mgw/Dockerfile index eec69ec..0cf8347 100644 --- a/osmo-ran/split/ran-bsc_mgw/Dockerfile +++ b/osmo-ran/split/ran-bsc_mgw/Dockerfile @@ -3,12 +3,13 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de> -ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/" -ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/" +ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" +ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" COPY .common/Release.key /tmp/Release.key diff --git a/osmo-ran/split/ran-bts_pcu/Dockerfile b/osmo-ran/split/ran-bts_pcu/Dockerfile index c3a1219..e49b8b1 100644 --- a/osmo-ran/split/ran-bts_pcu/Dockerfile +++ b/osmo-ran/split/ran-bts_pcu/Dockerfile @@ -3,12 +3,13 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de> -ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/" -ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/" +ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" +ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" COPY .common/Release.key /tmp/Release.key diff --git a/osmo-ran/split/ran-trx-ipc/Dockerfile b/osmo-ran/split/ran-trx-ipc/Dockerfile index b3677b4..bcd84cb 100644 --- a/osmo-ran/split/ran-trx-ipc/Dockerfile +++ b/osmo-ran/split/ran-trx-ipc/Dockerfile @@ -3,12 +3,13 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de> -ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/" -ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/" +ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" +ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" COPY .common/Release.key /tmp/Release.key diff --git a/osmo-ran/split/ran-trx-uhd/Dockerfile b/osmo-ran/split/ran-trx-uhd/Dockerfile index 9279112..08baa07 100644 --- a/osmo-ran/split/ran-trx-uhd/Dockerfile +++ b/osmo-ran/split/ran-trx-uhd/Dockerfile @@ -3,12 +3,13 @@ FROM $USER/systemd # Arguments used after FROM must be specified again ARG DISTRO ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" +ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" ARG OSMOCOM_REPO_VERSION=latest MAINTAINER Pau Espin Pedrol <pespin@sysmocom.de> -ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/Debian_9.0/" -ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/$OSMOCOM_REPO_VERSION/CentOS_8/" +ARG OSMOCOM_REPO_DEBIAN="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/Debian_9.0/" +ARG OSMOCOM_REPO_CENTOS="$OSMOCOM_REPO_MIRROR/$OSMOCOM_REPO_PATH/$OSMOCOM_REPO_VERSION/CentOS_8/" COPY .common/Release.key /tmp/Release.key |