<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10096">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git-deamon: Make sure to create the git-daemon user<br><br>Recent debian packages moved creation of the git-daemon user from<br>the main "git" package into the "git-daemon-run" package.  We want<br>the user without the latter...<br><br>Change-Id: I42f68ba31d32574a01d1372d8cc5239c420e816f<br>---<br>M Makefile<br>M git-daemon/Dockerfile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-bts-master/osmo-bts.cfg<br>5 files changed, 9 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/96/10096/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/Makefile b/Makefile</span><br><span>index eca64be..27f5659 100644</span><br><span>--- a/Makefile</span><br><span>+++ b/Makefile</span><br><span>@@ -1,3 +1,7 @@</span><br><span style="color: hsl(120, 100%, 40%);">+.PHONY: production</span><br><span style="color: hsl(120, 100%, 40%);">+production: bind9 redmine cgit gerrit git-daemon gitolite patchwork redmine</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> .PHONY: build</span><br><span> build: debian-jessie-build osmo-ggsn-master osmo-stp-master sctp-test sigtran-tests m3ua-test sua-test debian-stretch-titan ttcn3-ggsn-test</span><br><span> </span><br><span>diff --git a/git-daemon/Dockerfile b/git-daemon/Dockerfile</span><br><span>index 7dc7d39..9c4601b 100644</span><br><span>--- a/git-daemon/Dockerfile</span><br><span>+++ b/git-daemon/Dockerfile</span><br><span>@@ -8,6 +8,8 @@</span><br><span> </span><br><span> RUN apt-get install -qqy git</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+RUN useradd -u 30001 -g ssh git-daemon</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ADD git-daemon.sh /usr/bin/git-daemon.sh</span><br><span> VOLUME /git</span><br><span> </span><br><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 5af6abf..c2ae6fb 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -26,7 +26,7 @@</span><br><span> </span><br><span> WORKDIR        /tmp</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG     OSMO_BSC_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_BSC_BRANCH="neels/inter_bsc_ho"</span><br><span> </span><br><span> RUN       git clone git://git.osmocom.org/osmo-bsc.git</span><br><span> ADD     http://git.osmocom.org/osmo-bsc/patch?h=$OSMO_BSC_BRANCH /tmp/commit-osmo-bsc</span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index 3c2dbec..aa41cca 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -26,7 +26,7 @@</span><br><span> </span><br><span> WORKDIR   /tmp</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG     OSMO_BTS_BRANCH="master"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMO_BTS_BRANCH="laforge/meas256"</span><br><span> </span><br><span> RUN  git clone git://git.osmocom.org/osmo-bts.git</span><br><span> ADD     http://git.osmocom.org/osmo-bts/patch?h=$OSMO_BTS_BRANCH /tmp/commit-osmo-bts</span><br><span>diff --git a/osmo-bts-master/osmo-bts.cfg b/osmo-bts-master/osmo-bts.cfg</span><br><span>index e8feff5..bd37b48 100644</span><br><span>--- a/osmo-bts-master/osmo-bts.cfg</span><br><span>+++ b/osmo-bts-master/osmo-bts.cfg</span><br><span>@@ -67,6 +67,7 @@</span><br><span>  gsmtap-sapi pch</span><br><span>  min-qual-rach 50</span><br><span>  min-qual-norm -5</span><br><span style="color: hsl(120, 100%, 40%);">+ supp-meas-info toa256</span><br><span>  trx 0</span><br><span>   power-ramp max-initial 23000 mdBm</span><br><span>   power-ramp step-size 2000 mdB</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10096">change 10096</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10096"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I42f68ba31d32574a01d1372d8cc5239c420e816f </div>
<div style="display:none"> Gerrit-Change-Number: 10096 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>