From d0418d0f92b2cf73932c068f50bb55f90b78137b Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 14 Jan 2020 14:43:00 +0100 Subject: docker_images_require: add symlink code path Make development easier by skipping fetch, checkout and reset --hard if _docker_playground is a symlink. Document _docker_playground in README.adoc and explain how to set up the symlink. Change-Id: If6209ff71488d39e590f5f8506b9d73ad0314846 --- README.adoc | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'README.adoc') diff --git a/README.adoc b/README.adoc index aa45b58..786be0d 100644 --- a/README.adoc +++ b/README.adoc @@ -12,3 +12,14 @@ for more information about deployment. scripts: used by jenkins jobs. Various osmo*/contrib/jenkins.sh scripts assume osmo-ci to be checked out in the build slave user's home, i.e. using a PATH of $HOME/osmo-ci/scripts. + +_docker_playground: Clone of docker-playground.git, so the scripts can build +required docker images. This dir gets created on demand by scripts/common.sh, +and automatically fetched and reset to "origin/master" (override with +$OSMO_BRANCH_DOCKER_PLAYGROUND). The fetch and reset gets skipped if +_docker_playground is a symlink. For development, set it up as follows: + + $ git clone https://git.osmocom.org/docker-playground + $ git clone https://git.osmocom.org/osmo-ci + $ cd osmo-ci + $ ln -s ../docker-playground _docker_playground -- cgit v1.2.1