<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/26578">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
pespin: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sync debian-buster-build with debian-stretch-build<br><br>Change-Id: I6f871613fc4e8dd069cbe8c4a0ef3d1725be8c7a<br>---<br>A debian-bullseye-build/Makefile<br>M debian-buster-build/Dockerfile<br>2 files changed, 18 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/debian-bullseye-build/Makefile b/debian-bullseye-build/Makefile</span><br><span>new file mode 100644</span><br><span>index 0000000..8d0e10b</span><br><span>--- /dev/null</span><br><span>+++ b/debian-bullseye-build/Makefile</span><br><span>@@ -0,0 +1 @@</span><br><span style="color: hsl(120, 100%, 40%);">+include ../make/Makefile</span><br><span>diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile</span><br><span>index 2625e9e..87ada0f 100644</span><br><span>--- a/debian-buster-build/Dockerfile</span><br><span>+++ b/debian-buster-build/Dockerfile</span><br><span>@@ -1,7 +1,10 @@</span><br><span> ARG REGISTRY=docker.io</span><br><span style="color: hsl(0, 100%, 40%);">-FROM ${REGISTRY}/debian:buster</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ARG UPSTREAM_DISTRO=debian:buster</span><br><span style="color: hsl(120, 100%, 40%);">+FROM ${REGISTRY}/${UPSTREAM_DISTRO}</span><br><span style="color: hsl(120, 100%, 40%);">+# Arguments used after FROM must be specified again</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:"</span><br><span style="color: hsl(120, 100%, 40%);">+ARG OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"</span><br><span> </span><br><span> RUN apt-get update && \</span><br><span> apt-get upgrade -y && \</span><br><span>@@ -13,6 +16,7 @@</span><br><span> bison \</span><br><span> build-essential \</span><br><span> cppcheck \</span><br><span style="color: hsl(120, 100%, 40%);">+ dahdi-source \</span><br><span> debhelper \</span><br><span> devscripts \</span><br><span> dh-autoreconf \</span><br><span>@@ -25,6 +29,7 @@</span><br><span> gcc-arm-none-eabi \</span><br><span> git \</span><br><span> git-buildpackage \</span><br><span style="color: hsl(120, 100%, 40%);">+ gnupg \</span><br><span> libc-ares-dev \</span><br><span> libdbd-sqlite3 \</span><br><span> libdbi-dev \</span><br><span>@@ -50,8 +55,17 @@</span><br><span> pkg-config \</span><br><span> sqlite3 \</span><br><span> stow \</span><br><span style="color: hsl(120, 100%, 40%);">+ telnet \</span><br><span> wget && \</span><br><span> apt-get clean</span><br><span> </span><br><span> # Make respawn.sh part of this image, so it can be used by other images based on it</span><br><span> COPY .common/respawn.sh /usr/local/bin/respawn.sh</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+COPY .common/Release.key /tmp/Release.key</span><br><span style="color: hsl(120, 100%, 40%);">+RUN apt-key add /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ rm /tmp/Release.key && \</span><br><span style="color: hsl(120, 100%, 40%);">+ echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# Invalidate cache once the repository is updated</span><br><span style="color: hsl(120, 100%, 40%);">+ADD $OSMOCOM_REPO/Release /tmp/Release</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/26578">change 26578</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/+/26578"/><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: I6f871613fc4e8dd069cbe8c4a0ef3d1725be8c7a </div>
<div style="display:none"> Gerrit-Change-Number: 26578 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>