Change in docker-playground[master]: sync debian-buster-build with debian-stretch-build

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/26578 )

Change subject: sync debian-buster-build with debian-stretch-build
......................................................................

sync debian-buster-build with debian-stretch-build

Change-Id: I6f871613fc4e8dd069cbe8c4a0ef3d1725be8c7a
---
A debian-bullseye-build/Makefile
M debian-buster-build/Dockerfile
2 files changed, 18 insertions(+), 3 deletions(-)

Approvals:
  laforge: Looks good to me, approved; Verified
  pespin: Looks good to me, but someone else must approve



diff --git a/debian-bullseye-build/Makefile b/debian-bullseye-build/Makefile
new file mode 100644
index 0000000..8d0e10b
--- /dev/null
+++ b/debian-bullseye-build/Makefile
@@ -0,0 +1 @@
+include ../make/Makefile
diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile
index 2625e9e..87ada0f 100644
--- a/debian-buster-build/Dockerfile
+++ b/debian-buster-build/Dockerfile
@@ -1,7 +1,10 @@
 ARG	REGISTRY=docker.io
-FROM	${REGISTRY}/debian:buster
-
-MAINTAINER Harald Welte <laforge at gnumonks.org>
+ARG	UPSTREAM_DISTRO=debian:buster
+FROM	${REGISTRY}/${UPSTREAM_DISTRO}
+# Arguments used after FROM must be specified again
+ARG	OSMOCOM_REPO_MIRROR="http://download.opensuse.org"
+ARG	OSMOCOM_REPO_PATH="repositories/network:/osmocom:"
+ARG	OSMOCOM_REPO="$OSMOCOM_REPO_MIRROR/${OSMOCOM_REPO_PATH}/nightly/Debian_10/"
 
 RUN	apt-get update && \
 	apt-get upgrade -y && \
@@ -13,6 +16,7 @@
 		bison \
 		build-essential \
 		cppcheck \
+		dahdi-source \
 		debhelper \
 		devscripts \
 		dh-autoreconf \
@@ -25,6 +29,7 @@
 		gcc-arm-none-eabi \
 		git \
 		git-buildpackage \
+		gnupg \
 		libc-ares-dev \
 		libdbd-sqlite3 \
 		libdbi-dev \
@@ -50,8 +55,17 @@
 		pkg-config \
 		sqlite3 \
 		stow \
+		telnet \
 		wget && \
 	apt-get clean
 
 # Make respawn.sh part of this image, so it can be used by other images based on it
 COPY	.common/respawn.sh /usr/local/bin/respawn.sh
+
+COPY	.common/Release.key /tmp/Release.key
+RUN	apt-key add /tmp/Release.key && \
+	rm /tmp/Release.key && \
+	echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-nightly.list
+
+# Invalidate cache once the repository is updated
+ADD	$OSMOCOM_REPO/Release /tmp/Release

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/26578
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I6f871613fc4e8dd069cbe8c4a0ef3d1725be8c7a
Gerrit-Change-Number: 26578
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211215/1b15983e/attachment.htm>