diff options
| author | Harald Welte <laforge@osmocom.org> | 2021-12-15 15:34:54 +0100 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2021-12-15 18:04:45 +0000 |
| commit | 7b607306b732a705a39a7445e3dd16196bb4a351 (patch) | |
| tree | e56168f56f90e7b982bbedd481634d5f9fe0b9cc | |
| parent | 1fe2668f46c0713006b49947d5ce23f1209c9abd (diff) | |
sync debian-buster-build with debian-stretch-build
Change-Id: I6f871613fc4e8dd069cbe8c4a0ef3d1725be8c7a
| -rw-r--r-- | debian-bullseye-build/Makefile | 1 | ||||
| -rw-r--r-- | debian-buster-build/Dockerfile | 20 |
2 files changed, 18 insertions, 3 deletions
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@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 @@ RUN apt-get update && \ bison \ build-essential \ cppcheck \ + dahdi-source \ debhelper \ devscripts \ dh-autoreconf \ @@ -25,6 +29,7 @@ RUN apt-get update && \ gcc-arm-none-eabi \ git \ git-buildpackage \ + gnupg \ libc-ares-dev \ libdbd-sqlite3 \ libdbi-dev \ @@ -50,8 +55,17 @@ RUN apt-get update && \ 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 |