fixeria submitted this change.

View Change

Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved fixeria: Verified
open5gs-master: migrate to debian-bullseye-build

It's a common practice to have a shared '-build' image and base
the '-master' images on top of it to avoid installing same
dependencies across different images.

Finally we can use more recent meson from debian's repositories,
so no need to depend on python and install it using pip.

Change-Id: I93422916b232f686dc27a2ff452e20e73db50f58
Related: SYS#5602
---
M open5gs-master/Dockerfile
1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile
index 35385d7..eec8d71 100644
--- a/open5gs-master/Dockerfile
+++ b/open5gs-master/Dockerfile
@@ -1,19 +1,14 @@
ARG REGISTRY=docker.io
-FROM ${REGISTRY}/debian:buster
+ARG USER
+FROM $USER/debian-bullseye-build

MAINTAINER Harald Welte <laforge@gnumonks.org>

RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y --no-install-recommends \
- python3-pip \
- python3-setuptools \
- python3-wheel \
+ meson \
ninja-build \
- build-essential \
- flex \
- bison \
- git \
libsctp-dev \
libgnutls28-dev \
libgcrypt-dev \
@@ -27,20 +22,13 @@
libcurl4-gnutls-dev \
iproute2 \
ca-certificates \
- netbase \
- pkg-config && \
+ netbase && \
apt-get clean
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install meson
-

RUN apt-get update && \
apt-get upgrade -y && \
DEBIAN_FRONTEND=noninteractive \
apt-get install -y --no-install-recommends \
- git-buildpackage \
- debhelper \
- devscripts \
vim \
sudo \
iputils-ping \

To view, visit change 27069. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I93422916b232f686dc27a2ff452e20e73db50f58
Gerrit-Change-Number: 27069
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged