aboutsummaryrefslogtreecommitdiffstats
path: root/osmo-bts-master/Dockerfile
AgeCommit message (Collapse)AuthorFilesLines
2019-11-19Update osmo-*/Dockerfile to log stdout+stderr of process to log filePau Espin Pedrol1-2/+2
This way we get VTY parsing failures as well as backtraces upon process crash. Related: OS#4212 Change-Id: I9493ff73ef27c7c6d32b00cf827704b3f9cbf86a
2019-05-22Fix git checkout for branches and commitsOliver Smith1-1/+2
Replace 'git checkout -f -B $BRANCH origin/$BRANCH && \' in all Dockerfiles that accept branch variables ($OSMO_TTCN3_BRANCH, $OSMO_MGW_BRANCH, ...) with the following: git checkout $BRANCH && \ (git symbolic-ref -q HEAD && git reset --hard origin/$BRANCH || exit 1); \ This allows using branch names and commit hashes in the $BRANCH variables. Using commits is needed for the bisect script added in [1]. The second line ("(git symbolic...") checks if we are in detached HEAD state after the checkout, and if we are not, pulls in all new commits from origin/$BRANCH. Note that it ends in ';' instead of '&&', because the command in the next line should be executed even if "git symbolic-ref" does not exit with 0 (detached HEAD state). Here is an example, to illustrate that the new command does the right thing. Clone a repository and be 50 commits behind origin/master: $ git clone "https://git.osmocom.org/osmo-mgw" $ cd osmo-mgw $ git reset --hard origin/master~50 With BRANCH="master": $ git checkout master && \ (git symbolic-ref -q HEAD && git reset --hard origin/master || exit 1); \ echo "done" Already on 'master' ... done $ git status Your branch is up-to-date with 'origin/master'. With BRANCH="85978d": $ git checkout 85978d && \ (git symbolic-ref -q HEAD && git reset --hard origin/85978d || exit 1); \ echo "done" Note: checking out '85978d'. ... done $ git status HEAD detached at 85978dad Related previous changes: * [2] made it work for commit hashes, but broke using branch names other than master, and pulling in new commits from master * [3] made branches other than master work again, but did not fix pulling in new commits from master * [4] reverted [3] and the git checkout related part from [2] [1] Change-Id: I11f7e61a9b30d58a0fdfcaf77dde447806bf661f [2] Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869 [3] Change-Id: I2ff745c8d19b777d876170d5717c082ceb68a1f3 [4] Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25 Related: OS#4015 Change-Id: I4004980baf0b7d6096702b6f3067ccbdb369a28c
2019-05-21Revert "Simplify git checkout, allow branches and commits"Harald Welte1-1/+1
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 26565bb729549152ce8fa89f59df02f37c907c27. Change-Id: Ie6da0f9ea96f11407e38545a6b3cf22ef9cadc25
2019-05-07Simplify git checkout, allow branches and commitsOliver Smith1-1/+1
Replace the following statements: a) "git checkout -f -B $BRANCH origin/$BRANCH" b) "git checkout -f -B $BRANCH $BRANCH" with: 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-04-25Add OSMO_*_BRANCH environment variables for build argsDaniel Willmann1-1/+1
Previously we could only set OSMO_TTCN3_BRANCH as environment variable to build a test other than master. This patch adds environment variables for all osmo-*-master images which allow docker tests to be executed for an arbitrary commit. The origin/ prefix from the git checkout command is removed so the *_BRANCH variable doesn't have to contain branch names, but van also contain arbitrary commits. This shouldn't have any adverse effect as we only have one remote in the checkout. Change-Id: If3bc5fae07cf63c4fef68306be4c4328660bc869
2019-03-30Switch all osmo-*-master and ttcn3-*-test from jessie to stretchHarald Welte1-2/+2
Jessie will be EOL in June 2019, let's make the switch to stretch before that. Change-Id: I37a534d07081f3d321869c86d49d03171c8da0c6
2019-03-29print branch name and git commit hash during docker container buildHarald Welte1-0/+1
This is quite useful when looking at jenkins logs to know which exact version was built at the time. Change-Id: Id52c382b454e2beecf46820752aeff15b2c1a0ae
2018-09-06Fix "'laforge/debian-jessie-build' not found"Oliver Smith1-1/+2
Instead of hardcoding laforge's username in all FROM statements in the Dockerfiles, make use of the USER variable (as passed through by the "make/Makefile" with "docker build --build-arg USER=..."). Thanks to fixeria for proposing this fix! This requires running docker-ce, old versions of docker (such as the one in the official repositories of the latest Fedora) don't support variables in the FROM line. But docker-ce can be installed after adding docker's 3rd party repositories. Closes: OS#3457 Change-Id: Ic5f11c8a4e247f632cb6aea6d147e94c53e0130f
2018-05-23osmo-bts-master: add Dockerfile ARG for git repo branch to be builtPhilipp Maier1-2/+4
This allows the user to build any non-master branches of the related repositories, which is helpful for local testing before pushing changes to git. Change-Id: Ide8248cb508be27f2cff620d79df7eb50f309af1
2018-03-01Add osmo-bts-test + dependenciesHarald Welte1-0/+2
2017-12-17osmo-*: Ensure container is rebuilt if nightly repo is updatedHarald Welte1-1/+4
Let's use the "ADD" trick that we use for git repositories also for the osmocom:nightly debian package feed. This way any change to the package feed will result in a rebuild of the container.
2017-11-19osmo-bts no longer needs openbsc.gitHarald Welte1-6/+0
2017-08-28Fix Dockerfile syntax error in apt-get commandHarald Welte1-1/+1
2017-08-27apt-get: always use --no-install-recommends and apt-get cleanHarald Welte1-8/+10
this helps us to avoid installing unneeded packages and removes the package cache from the images to keep them less bloated.
2017-08-20osmo-bts-master: Send GSMTAP (incl. BCCH) to .239 (sysinfo tester)Harald Welte1-1/+2
2017-08-20add Dockerfiles for osmo-nitb, osmo-sgsn + osmo-bts building latest masterHarald Welte1-0/+44