February 2022 - gerrit-log - lists.osmocom.org

Change in docker-playground[master]: open5gs-master: install dependencies using mk-build-deps

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27070 ) Change subject: open5gs-master: install dependencies using mk-build-deps ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Gerrit-Change-Number: 27070 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 12:57:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: migrate to debian-bullseye-build

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27069 ) Change subject: open5gs-master: migrate to debian-bullseye-build ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I93422916b232f686dc27a2ff452e20e73db50f58 Gerrit-Change-Number: 27069 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 12:57:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: debian-{bullseye,buster,jessie}-build: install 'equivs' package

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27068 ) Change subject: debian-{bullseye,buster,jessie}-build: install 'equivs' package ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id599d70dc7e5222d62aa5c155bbc75420b913de5 Gerrit-Change-Number: 27068 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 12:56:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: run 8 parallel jobs for 'make deps'

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27067 ) Change subject: debian-bullseye-titan: run 8 parallel jobs for 'make deps' ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991 Gerrit-Change-Number: 27067 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 12:56:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: add dahdi-linux

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27065 ) Change subject: jobs/gerrit-lint: add dahdi-linux ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27065 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7fdb40e40fb8cf8c9072a4e898aeffa43d1d7ae0 Gerrit-Change-Number: 27065 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 12:53:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: migrate to debian-bullseye-build

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27069 ) Change subject: open5gs-master: migrate to debian-bullseye-build ...................................................................... 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(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/69/27069/1 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(a)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 https://gerrit.osmocom.org/c/docker-playground/+/27069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I93422916b232f686dc27a2ff452e20e73db50f58 Gerrit-Change-Number: 27069 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: open5gs-master: install dependencies using mk-build-deps

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27070 ) Change subject: open5gs-master: install dependencies using mk-build-deps ...................................................................... open5gs-master: install dependencies using mk-build-deps This is a 3-rd party project, which may introduce new dependencies in the future. Rather than maintaining our own list of packages to install, let's employ mk-build-deps. This tool parses 'debian/control' and installs all dependencies automatically. Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Related: SYS#5602 --- M open5gs-master/Dockerfile 1 file changed, 11 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/27070/1 diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index eec8d71..98af726 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -6,31 +6,11 @@ RUN apt-get update && \ apt-get upgrade -y && \ - apt-get install -y --no-install-recommends \ - meson \ - ninja-build \ - libsctp-dev \ - libgnutls28-dev \ - libgcrypt-dev \ - libssl-dev \ - libidn11-dev \ - libmongoc-dev \ - libbson-dev \ - libyaml-dev \ - libnghttp2-dev \ - libmicrohttpd-dev \ - libcurl4-gnutls-dev \ - iproute2 \ - ca-certificates \ - netbase && \ - apt-get clean - -RUN apt-get update && \ - apt-get upgrade -y && \ DEBIAN_FRONTEND=noninteractive \ apt-get install -y --no-install-recommends \ vim \ sudo \ + iproute2 \ iputils-ping \ net-tools && \ apt-get clean @@ -44,14 +24,21 @@ WORKDIR /home/${username} -# build + install open5gs - +# clone open5gs ARG GITHUB_USER=open5gs ARG GITHUB_REPO=open5gs ARG OPEN5GS_BRANCH=main RUN git clone https://github.com/$GITHUB_USER/$GITHUB_REPO ADD https://api.github.com/repos/$GITHUB_USER/$GITHUB_REPO/git/refs/heads/$OPEN… /root/open5gs-ver.json +# update the source code (if needed) RUN cd $GITHUB_REPO && \ - git fetch && git checkout -f -B $OPEN5GS_BRANCH origin/$OPEN5GS_BRANCH && \ + git fetch && git checkout -f -B $OPEN5GS_BRANCH origin/$OPEN5GS_BRANCH + +# install dependencies specified in debian/control +RUN cd $GITHUB_REPO && \ + mk-build-deps -i -r -t 'apt-get --no-install-recommends -yV' + +# build + install open5gs +RUN cd $GITHUB_REPO && \ meson build && ninja -C build install -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27070 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I71ad7256116ee30f15aff38fd38588aa2bfab456 Gerrit-Change-Number: 27070 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: debian-bullseye-titan: run 8 parallel jobs for 'make deps'

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27067 ) Change subject: debian-bullseye-titan: run 8 parallel jobs for 'make deps' ...................................................................... debian-bullseye-titan: run 8 parallel jobs for 'make deps' This reduces the time required for building test suites. Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991 --- M debian-bullseye-titan/Dockerfile M debian-bullseye-titan/ttcn3-docker-prepare.sh 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/67/27067/1 diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index 0b1fbda..1c22456 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -65,7 +65,7 @@ RUN if ! diff -q /tmp/deps-Makefile /osmo-ttcn3-hacks/deps/Makefile; then \ cd /osmo-ttcn3-hacks && \ git pull && \ - make deps; \ + make -j8 deps; \ fi ADD ttcn3-docker-prepare.sh /usr/local/bin/ttcn3-docker-prepare diff --git a/debian-bullseye-titan/ttcn3-docker-prepare.sh b/debian-bullseye-titan/ttcn3-docker-prepare.sh index e4144e2..c2b28b9 100755 --- a/debian-bullseye-titan/ttcn3-docker-prepare.sh +++ b/debian-bullseye-titan/ttcn3-docker-prepare.sh @@ -29,7 +29,7 @@ # OSMO_TTCN3_BRANCH is different). The Dockerfile does the initial 'make deps' # and downloads /tmp/deps-Makefile. if ! diff -q /tmp/deps-Makefile deps/Makefile; then - make deps + make -j8 deps fi # Link start/stop scripts to / -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27067 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6349d8304a248c7ae2a5373bf23a691f3a1cb991 Gerrit-Change-Number: 27067 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: debian-{bullseye,buster,jessie}-build: install 'equivs' package

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27068 ) Change subject: debian-{bullseye,buster,jessie}-build: install 'equivs' package ...................................................................... debian-{bullseye,buster,jessie}-build: install 'equivs' package This package is required by Debian's mk-build-deps tool. Change-Id: Id599d70dc7e5222d62aa5c155bbc75420b913de5 Related: SYS#5602 --- M debian-bullseye-build/Dockerfile M debian-buster-build/Dockerfile M debian-jessie-build/Dockerfile 3 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/68/27068/1 diff --git a/debian-bullseye-build/Dockerfile b/debian-bullseye-build/Dockerfile index dcea217..14f5625 100644 --- a/debian-bullseye-build/Dockerfile +++ b/debian-bullseye-build/Dockerfile @@ -21,6 +21,7 @@ devscripts \ dh-autoreconf \ doxygen \ + equivs \ flex \ g++ \ gawk \ diff --git a/debian-buster-build/Dockerfile b/debian-buster-build/Dockerfile index 87ada0f..b80d881 100644 --- a/debian-buster-build/Dockerfile +++ b/debian-buster-build/Dockerfile @@ -22,6 +22,7 @@ dh-autoreconf \ dh-systemd \ doxygen \ + equivs \ flex \ g++ \ gawk \ diff --git a/debian-jessie-build/Dockerfile b/debian-jessie-build/Dockerfile index b043762..141d258 100644 --- a/debian-jessie-build/Dockerfile +++ b/debian-jessie-build/Dockerfile @@ -18,6 +18,7 @@ dh-autoreconf \ dh-systemd \ doxygen \ + equivs \ flex \ g++ \ gawk \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id599d70dc7e5222d62aa5c155bbc75420b913de5 Gerrit-Change-Number: 27068 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: debian-stretch-jenkins: install libelf-dev

by pespin

Attention is currently required from: osmith, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27064 ) Change subject: debian-stretch-jenkins: install libelf-dev ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27064 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id72d19ad08681cd7cb3194de2226292f19e96df5 Gerrit-Change-Number: 27064 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Fri, 04 Feb 2022 12:08:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022