<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/23303">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Make respawn.sh a common part of *-build/-obs images<br><br>Maintaining several versions of the same file in different folders<br>is a bad idea, because at some point their content gets out of sync.<br>This is exactly what happened to 'respawn.sh': sleep()ing was only<br>implemented in 'osmo-bts-master/respawn.sh', other versions of this<br>file would simply ignore '$SLEEP_BEFORE_RESPAWN'.<br><br>The easiest solution would be to have all common files in a single<br>directory, however Docker does not allow to ADD files from outside<br>of the build context.  In other words, all files must be in the<br>same directory with the Dockerfile itself.<br><br>At the same time, Docker allows the first argument of ADD to be<br>an URL, and at least HTTP(S) is supported.  Most of our images<br>require the Internet connectivity anyway, so let's make it grab<br>'respawn.sh' from https://git.osmocom.org/docker-playground/.<br><br>Change-Id: I3ec86c8610b3b43d39ea8e3da444861d317ced4e<br>---<br>M centos8-build/Dockerfile<br>M centos8-obs-latest/Dockerfile<br>R common/respawn.sh<br>M debian-buster-build/Dockerfile<br>M debian-jessie-build/Dockerfile<br>M debian-sid-build/Dockerfile<br>M debian-stretch-obs-latest/Dockerfile<br>M osmo-bts-latest/Dockerfile<br>D osmo-bts-latest/respawn.sh<br>M osmo-bts-master/Dockerfile<br>M osmo-pcu-latest/Dockerfile<br>D osmo-pcu-latest/respawn.sh<br>M osmo-pcu-master/Dockerfile<br>D osmo-pcu-master/respawn.sh<br>14 files changed, 18 insertions(+), 53 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/03/23303/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/centos8-build/Dockerfile b/centos8-build/Dockerfile</span><br><span>index 412816c..8a1125b 100644</span><br><span>--- a/centos8-build/Dockerfile</span><br><span>+++ b/centos8-build/Dockerfile</span><br><span>@@ -52,3 +52,6 @@</span><br><span> </span><br><span> # Invalidate cache once the repository is updated</span><br><span> ADD       $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+ADD    https://git.osmocom.org/docker-playground/plain/common/respawn.sh /usr/local/bin/respawn.sh</span><br><span>diff --git a/centos8-obs-latest/Dockerfile b/centos8-obs-latest/Dockerfile</span><br><span>index 4b2357b..37a2770 100644</span><br><span>--- a/centos8-obs-latest/Dockerfile</span><br><span>+++ b/centos8-obs-latest/Dockerfile</span><br><span>@@ -19,3 +19,6 @@</span><br><span> </span><br><span> # Invalidate cache once the repository is updated</span><br><span> ADD $OSMOCOM_REPO_MIRROR/repositories/network:/osmocom:/latest/CentOS_8/repodata/repomd.xml /tmp/repomd.xml</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+ADD     https://git.osmocom.org/docker-playground/plain/common/respawn.sh /usr/local/bin/respawn.sh</span><br><span>diff --git a/osmo-bts-master/respawn.sh b/common/respawn.sh</span><br><span>similarity index 100%</span><br><span>rename from osmo-bts-master/respawn.sh</span><br><span>rename to common/respawn.sh</span><br><span>diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile</span><br><span>index 119afea..aca4a4d 100644</span><br><span>--- a/debian-buster-build/Dockerfile</span><br><span>+++ b/debian-buster-build/Dockerfile</span><br><span>@@ -52,3 +52,6 @@</span><br><span>            stow \</span><br><span>               wget && \</span><br><span>    apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+ADD       https://git.osmocom.org/docker-playground/plain/common/respawn.sh /usr/local/bin/respawn.sh</span><br><span>diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile</span><br><span>index 60f6ca9..74f4f46 100644</span><br><span>--- a/debian-jessie-build/Dockerfile</span><br><span>+++ b/debian-jessie-build/Dockerfile</span><br><span>@@ -52,3 +52,6 @@</span><br><span>                 stow \</span><br><span>               wget && \</span><br><span>    apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+ADD       https://git.osmocom.org/docker-playground/plain/common/respawn.sh /usr/local/bin/respawn.sh</span><br><span>diff --git a/debian-sid-build/Dockerfile b/debian-sid-build/Dockerfile</span><br><span>index ffa86e2..256840b 100644</span><br><span>--- a/debian-sid-build/Dockerfile</span><br><span>+++ b/debian-sid-build/Dockerfile</span><br><span>@@ -50,3 +50,6 @@</span><br><span>             sqlite3 \</span><br><span>            wget && \</span><br><span>    apt-get clean</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+ADD       https://git.osmocom.org/docker-playground/plain/common/respawn.sh /usr/local/bin/respawn.sh</span><br><span>diff --git a/debian-stretch-obs-latest/Dockerfile b/debian-stretch-obs-latest/Dockerfile</span><br><span>index 3bef05c..9c4d818 100644</span><br><span>--- a/debian-stretch-obs-latest/Dockerfile</span><br><span>+++ b/debian-stretch-obs-latest/Dockerfile</span><br><span>@@ -20,3 +20,6 @@</span><br><span> </span><br><span> # Invalidate cache once the repository is updated</span><br><span> ADD    $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span style="color: hsl(120, 100%, 40%);">+ADD  https://git.osmocom.org/docker-playground/plain/common/respawn.sh /usr/local/bin/respawn.sh</span><br><span>diff --git a/osmo-bts-latest/Dockerfile b/osmo-bts-latest/Dockerfile</span><br><span>index 202a29c..2b41968 100644</span><br><span>--- a/osmo-bts-latest/Dockerfile</span><br><span>+++ b/osmo-bts-latest/Dockerfile</span><br><span>@@ -20,8 +20,6 @@</span><br><span>                 ;; \</span><br><span>         esac</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ADD     respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> WORKDIR /tmp</span><br><span> </span><br><span> VOLUME      /data</span><br><span>diff --git a/osmo-bts-latest/respawn.sh b/osmo-bts-latest/respawn.sh</span><br><span>deleted file mode 100755</span><br><span>index 2413916..0000000</span><br><span>--- a/osmo-bts-latest/respawn.sh</span><br><span>+++ /dev/null</span><br><span>@@ -1,15 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-trap "kill 0" EXIT</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-i=0</span><br><span style="color: hsl(0, 100%, 40%);">-max_i=500</span><br><span style="color: hsl(0, 100%, 40%);">-while [ $i -lt $max_i ]; do</span><br><span style="color: hsl(0, 100%, 40%);">-      echo "$i: starting: $*"</span><br><span style="color: hsl(0, 100%, 40%);">-       $* &</span><br><span style="color: hsl(0, 100%, 40%);">-        LAST_PID=$!</span><br><span style="color: hsl(0, 100%, 40%);">-     wait $LAST_PID</span><br><span style="color: hsl(0, 100%, 40%);">-  echo "$i: stopped pid $LAST_PID with status $?"</span><br><span style="color: hsl(0, 100%, 40%);">-       i=$(expr $i + 1)</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">-echo "exiting after $max_i runs"</span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index 13df628..77c1e51 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -30,8 +30,6 @@</span><br><span>              ;; \</span><br><span>         esac</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ADD     respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> WORKDIR /tmp</span><br><span> </span><br><span> ARG OSMO_BTS_BRANCH="master"</span><br><span>diff --git a/osmo-pcu-latest/Dockerfile b/osmo-pcu-latest/Dockerfile</span><br><span>index 622f933..7f1b3ac 100644</span><br><span>--- a/osmo-pcu-latest/Dockerfile</span><br><span>+++ b/osmo-pcu-latest/Dockerfile</span><br><span>@@ -17,8 +17,6 @@</span><br><span>          ;; \</span><br><span>         esac</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ADD     respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> WORKDIR /tmp</span><br><span> </span><br><span> VOLUME      /data</span><br><span>diff --git a/osmo-pcu-latest/respawn.sh b/osmo-pcu-latest/respawn.sh</span><br><span>deleted file mode 100755</span><br><span>index 2413916..0000000</span><br><span>--- a/osmo-pcu-latest/respawn.sh</span><br><span>+++ /dev/null</span><br><span>@@ -1,15 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-trap "kill 0" EXIT</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-i=0</span><br><span style="color: hsl(0, 100%, 40%);">-max_i=500</span><br><span style="color: hsl(0, 100%, 40%);">-while [ $i -lt $max_i ]; do</span><br><span style="color: hsl(0, 100%, 40%);">-      echo "$i: starting: $*"</span><br><span style="color: hsl(0, 100%, 40%);">-       $* &</span><br><span style="color: hsl(0, 100%, 40%);">-        LAST_PID=$!</span><br><span style="color: hsl(0, 100%, 40%);">-     wait $LAST_PID</span><br><span style="color: hsl(0, 100%, 40%);">-  echo "$i: stopped pid $LAST_PID with status $?"</span><br><span style="color: hsl(0, 100%, 40%);">-       i=$(expr $i + 1)</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">-echo "exiting after $max_i runs"</span><br><span>diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index f8e6ded..41cd6d5 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -21,8 +21,6 @@</span><br><span>              ;; \</span><br><span>         esac</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ADD     respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> WORKDIR /tmp</span><br><span> </span><br><span> ARG OSMO_PCU_BRANCH="master"</span><br><span>diff --git a/osmo-pcu-master/respawn.sh b/osmo-pcu-master/respawn.sh</span><br><span>deleted file mode 100755</span><br><span>index 2413916..0000000</span><br><span>--- a/osmo-pcu-master/respawn.sh</span><br><span>+++ /dev/null</span><br><span>@@ -1,15 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-#!/bin/sh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-trap "kill 0" EXIT</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-i=0</span><br><span style="color: hsl(0, 100%, 40%);">-max_i=500</span><br><span style="color: hsl(0, 100%, 40%);">-while [ $i -lt $max_i ]; do</span><br><span style="color: hsl(0, 100%, 40%);">- echo "$i: starting: $*"</span><br><span style="color: hsl(0, 100%, 40%);">-       $* &</span><br><span style="color: hsl(0, 100%, 40%);">-        LAST_PID=$!</span><br><span style="color: hsl(0, 100%, 40%);">-     wait $LAST_PID</span><br><span style="color: hsl(0, 100%, 40%);">-  echo "$i: stopped pid $LAST_PID with status $?"</span><br><span style="color: hsl(0, 100%, 40%);">-       i=$(expr $i + 1)</span><br><span style="color: hsl(0, 100%, 40%);">-done</span><br><span style="color: hsl(0, 100%, 40%);">-echo "exiting after $max_i runs"</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/23303">change 23303</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/c/docker-playground/+/23303"/><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-Change-Id: I3ec86c8610b3b43d39ea8e3da444861d317ced4e </div>
<div style="display:none"> Gerrit-Change-Number: 23303 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>