<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/20677">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">osmo-*-master: Invalidate docker cache when CentOS repo changes<br><br>We currently only invalidate the cache if the Debian repository changes,<br>but not if the CentOS repository changes. This leads to strange<br>artefacts, such as CentOS containers for osmo-bts-master using an<br>old libosmocore, despite a new one being available in the repo.<br><br>As Dockerfiles don't support conditional "ADD", we need to actually<br>add both the CentOS and the Debian repsotiry file, so any change<br>in either of the two will now (unneccessarily) invalidate the cache<br>for both Debian and CentOS builds.<br><br>Change-Id: I7b13644afb9d3be3b94184193177e003c13718d3<br>---<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-hnbgw-master/Dockerfile<br>M osmo-mgw-master/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-nitb-master/Dockerfile<br>M osmo-pcu-master/Dockerfile<br>M osmo-remsim-master/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-smlc-master/Dockerfile<br>M osmo-stp-master/Dockerfile<br>14 files changed, 42 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 6cfaebd..6c39831 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index 6e208c6..df6ebb6 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index 17ea3c9..a70a62e 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index 1595c11..b6e572b 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile</span><br><span>index 215b562..2e7b0b7 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -11,7 +11,10 @@</span><br><span> rm /tmp/Release.key && \</span><br><span> echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN apt-get update && \</span><br><span> apt-get install -y --no-install-recommends \</span><br><span> telnet \</span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index c07697e..4097f56 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index 15b59f0..c7e8508 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile</span><br><span>index cd463fe..edb5434 100644</span><br><span>--- a/osmo-nitb-master/Dockerfile</span><br><span>+++ b/osmo-nitb-master/Dockerfile</span><br><span>@@ -11,7 +11,10 @@</span><br><span> rm /tmp/Release.key && \</span><br><span> echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN apt-get update && \</span><br><span> apt-get install -y --no-install-recommends \</span><br><span> telnet \</span><br><span>diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index 8306837..af4426b 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile</span><br><span>index 2653ac2..d50f624 100644</span><br><span>--- a/osmo-remsim-master/Dockerfile</span><br><span>+++ b/osmo-remsim-master/Dockerfile</span><br><span>@@ -43,7 +43,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index 58da791..c50b476 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index 1f40ff0..e486979 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-smlc-master/Dockerfile b/osmo-smlc-master/Dockerfile</span><br><span>index 94ab33d..b820cf6 100644</span><br><span>--- a/osmo-smlc-master/Dockerfile</span><br><span>+++ b/osmo-smlc-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index 26ec494..bc3e177 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -18,7 +18,10 @@</span><br><span> ;; \</span><br><span> esac</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+# we need to add this to invalidate the cache once the repository is updated.</span><br><span style="color: hsl(120, 100%, 40%);">+# unfortunately Dockerfiles don't support a conditional ARG, so we need to add both DPKG + RPM</span><br><span> ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span style="color: hsl(120, 100%, 40%);">+ADD http://download.opensuse.org/repositories/network:/osmocom:/nightly/CentOS_8_Stream/repodata/repomd.xml /tmp/repomd.xml</span><br><span> RUN case "$DISTRO" in \</span><br><span> debian*) \</span><br><span> apt-get update && \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/20677">change 20677</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/+/20677"/><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: I7b13644afb9d3be3b94184193177e003c13718d3 </div>
<div style="display:none"> Gerrit-Change-Number: 20677 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>