Commit Graph

17 Commits

Author SHA1 Message Date
Vadim Yanitskiy ea90e44ab0 */Dockerfile: clone from using https://
* Do not clone using deprecated git://, use https:// instead.
* Clone from the main repo (if possible).
* Use the gitiles plugin to fetch the last commit from Gerrit.

Change-Id: I204fa6e3e3ebbdb8732393b897fca35659d61ae8
2023-01-06 23:10:13 +07:00
Oliver Smith 38f7fcb265 */.release: remove
These files are in .gitignore and get generated at the end of running
'make'. Remove them to have less cluttered 'git grep' output.

Change-Id: Ie5bf05220359ac0941f62cc86ed843363548784a
2022-07-06 12:36:26 +02:00
Oliver Smith c6094726ae */Dockerfile: drop MAINTAINER line
MAINTAINER is deprecated, drop the line in all Dockerfiles as suggested
by Vadim.

Change-Id: If1ef3032af2075d792c526ae744ec4c0c091da3a
2022-05-13 18:17:06 +02:00
Vadim Yanitskiy 6ab6e52249 gr-gsm-master: migrate from archlinux to debian-bullseye-build
Arch Linux ships gnuradio-, while gr-gsm has not been migrated
to 3.9 yet.  Let's use debian:bullseye, which ships gnuradio-

Change-Id: I9900addf152fd254283ef340cea16583ee5ac1c5
2022-03-26 00:08:56 +03:00
Oliver Smith a0a991f412 make/Makefile: always use docker run --rm
Add --rm to the "docker run" line in make/Makefile, and remove it from

Related: SYS#5827
Change-Id: Iea063aa39a08397ea64d2018b433991a130e7f56
2022-02-14 07:46:23 +00:00
Vadim Yanitskiy 44393058f6 make/Makefile: allow overriding '-it' for target 'run'
Allocating a pseudo-TTY (-t, --tty) fails when 'run' is executed
inside of a Jenkins or cron script.  This change fixes
ttcn3-bts-test, which invokes 'run' to fetch the config files.

Change-Id: If22f682be4f004c5bb43e65098079a4f4fe6158d
Fixes: If15461240f3037c142c176fc7da745a1701ae3f8
2022-02-11 15:21:16 +06:00
Harald Welte 027826fdba introduce 'REGISTRY' argument to all Dockerfiles
This is initialized to, keeping the default behaviour
if not specified.  However, it allows us to specify a private
registry later on.

Related: OS#4839
Change-Id: I32d4ee6256033c809108c1b86cb6b6c58d880f49
2020-11-02 17:02:26 +01:00
Vadim Yanitskiy e6e2b06689 make: use $(nproc) instead of hard-coded number of cores
Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c
2020-07-13 02:52:10 +07:00
Harald Welte 06ac6e455e Revert "Simplify git checkout, allow branches and commits"
Unfortuately this commit will check out *local* master (i.e. the
previous checkout) rather than the origin/master as it's supposed to
be. This means that ever since merging this patch, our ttcn3 tests
were running some "undefined" stale versions and not current master.

This reverts commit 26565bb729.

Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
2019-05-21 17:53:11 +02:00
Oliver Smith 26565bb729 Simplify git checkout, allow branches and commits
Replace the following statements:

a) "git checkout -f -B $BRANCH origin/$BRANCH"
b) "git checkout -f -B $BRANCH $BRANCH"


c) "git checkout -f $BRANCH"

Regarding a), we don't need to specify 'origin/' for each branch, since
we are cloning the repositories in the same Dockerfile, and therefore we
know for sure that there is only one remote and branch names won't be
ambiguous. Removing the 'origin/' allows to put commit hashes into the
branch variables (like done in the new bisect script [1]).

Version b) does not work with branch names:
$ git checkout -f -B osmith/check-imei-before-lu osmith/check-imei-before-lu
fatal: Cannot update paths and switch to branch 'osmith/check-imei-before-lu' at the same time.
Did you intend to checkout 'osmith/check-imei-before-lu' which can not be resolved as commit?

New version c) works with both commits and branches, and it is shorter.

[1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f

Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3
2019-05-07 10:24:52 +02:00
Vadim Yanitskiy 857d60059c gr-gsm-master/Dockerfile: use the official archlinux/base image
According to [1], the image 'base/archlinux' has been deprecated.
It's recommended to use the official ArchLinux docker image [2].


Change-Id: I7e5d57662e9d8ca2b5037c24427ce1c44de15813
2019-05-05 18:59:16 +03:00
Harald Welte cffe1022b5 print branch name and git commit hash during docker container build
This is quite useful when looking at jenkins logs to know which exact
version was built at the time.

Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae
2019-03-29 16:40:40 +00:00
Piotr Krysik 04933275db gr-gsm-master/Dockerfile: fix: disable GRCC compilation
Change-Id: I80b079a700caf2b87d627606ae3978a7f9d864a7
2018-10-20 20:56:24 +02:00
Vadim Yanitskiy 9a80e4f095 gr-gsm-master/Dockerfile: use 'master' branch for gr-gsm
All required changes from 'fixeria/trx' have been merged.

Change-Id: I6e228ca15577b8f2734a23ca57c436a3f7fb26fa
2018-09-06 22:43:02 +07:00
Vadim Yanitskiy c7ff506687 gr-gsm-master/Dockerfile: fix full system upgrade
Thanks to Piotr, it was discovered that the image building
process fails during full system upgrade:

  RUN    pacman -Syu

with the following output:

  looking for conflicting packages...
  Packages (2) ca-certificates-mozilla-*  p11-kit-*


  :: Proceed with installation? [Y/n]
  The command '/bin/sh -c pacman -Syu' returned a non-zero code: 1

Looks like the '--noconfirm' flag was missing.

Change-Id: Icb3ccb9a9531686efcebb3e277421c4c05387b09
2018-09-06 22:35:36 +07:00
Vadim Yanitskiy 00ffd6a231 gr-gsm-master/Makefile: enable host USB access
Privileged USB access is required for direct communication
between the image's UHD driver and a host's USRP device.

Change-Id: I8170d2c31b4e28f6a406c50b10b7626f70f36d28
2018-08-09 18:53:05 +07:00
Vadim Yanitskiy b642b8688d Introduce Dockerfile for the GR-GSM project
This change introduces a new sub-project - 'gr-gsm-master'.
It was decided to use Arch Linux as the base image, because it
provides the recent version of both UHD and GNU Radio without
tons of dependencies, such as Xorg.

Note: as there in no libosmocore package in Arch Linux, it will
be built from the latest source code.

Change-Id: I115b59dc9eaec5d132f3f64c4ee321173459e9ed
2018-08-09 17:36:27 +07:00