October 2023 - gerrit-log - lists.osmocom.org

[S] Change in docker-playground[master]: open5gs-master: Make mongodb available in the image
by pespin 10 Oct '23

10 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34711?usp=email ) Change subject: open5gs-master: Make mongodb available in the image ...................................................................... open5gs-master: Make mongodb available in the image The open5gs-latest image installs mongodb, but the master one doesn't. Having a mongodb image is required to run together with open5gs-hssd. Related: SYS#6588 Change-Id: Id6dde5f54b666279c102eb14fabb87194192c9e4 --- M open5gs-master/Dockerfile 1 file changed, 41 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 827d661..e9b3cf4 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -2,6 +2,8 @@ ARG USER ARG DISTRO FROM $USER/$DISTRO-build +# Arguments used after FROM must be specified again +ARG DISTRO RUN apt-get update && \ apt-get upgrade -y && \ @@ -13,9 +15,34 @@ iproute2 \ iputils-ping \ libcap2-bin \ - net-tools && \ + net-tools \ + wget && \ apt-get clean +ARG MONGODB_KEY=/usr/share/keyrings/mongodb-org.asc +RUN wget "https://pgp.mongodb.com/server-5.0.asc" -O "$MONGODB_KEY" +RUN case "$DISTRO" in \ + debian-*) \ + DEBIAN_VERSION=$(echo "$DISTRO" | cut -d "-" -f2); \ + if [ "x${DEBIAN_VERSION}" = "xbookworm" ]; then \ + echo "Using bullseye since bookworm mongodb-org package is not available. Furthermore, manually install required libssl1.1." && \ + DEBIAN_VERSION="bullseye" && \ + wget "http://security.debian.org/debian-security/pool/updates/main/o/openssl/libs…" && \ + dpkg -i "libssl1.1_1.1.1n-0+deb10u6_amd64.deb" && \ + rm "libssl1.1_1.1.1n-0+deb10u6_amd64.deb"; \ + fi; \ + echo "deb [signed-by=$MONGODB_KEY] http://repo.mongodb.org/apt/debian ${DEBIAN_VERSION}/mongodb-org/5.0 main" \ + > /etc/apt/sources.list.d/mongodb-org.list \ + ;; \ + centos*) \ + echo "TODO: centos" && \ + exit 1 \ + ;; \ + esac +RUN apt-get update && \ + apt-get install -y \ + mongodb-org + # create a user ARG username=osmocom RUN useradd -m ${username} && \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34711?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6dde5f54b666279c102eb14fabb87194192c9e4 Gerrit-Change-Number: 34711 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: open5gs-master: Make mongodb available in the image
by fixeria 10 Oct '23

10 Oct '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34711?usp=email ) Change subject: open5gs-master: Make mongodb available in the image ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34711?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6dde5f54b666279c102eb14fabb87194192c9e4 Gerrit-Change-Number: 34711 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 16:16:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: open5gs-master: Install open5gs-dbctl to /usr/bin
by pespin 10 Oct '23

10 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email ) Change subject: open5gs-master: Install open5gs-dbctl to /usr/bin ...................................................................... open5gs-master: Install open5gs-dbctl to /usr/bin meson install doesn't install that file because it's aimed at developers. However, debian package does install it manually in debian/open5gs-common.install. Hence, the app is available in open5gs-latest docker image, but not in open5gs-master. Manually copy it to /usr/bin to have both behave the same in this aspect. Related: SYS#6588 Change-Id: I54a760d04e6522d843e6d65b94ef6067e502fbaa --- M open5gs-master/Dockerfile 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 99def99..827d661 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -55,4 +55,5 @@ --libdir=lib/x86_64-linux-gnu \ --libexecdir=lib/x86_64-linux-gnu && \ meson configure build && \ - ninja -C build install + ninja -C build install && \ + install -m 0755 build/misc/db/open5gs-dbctl /usr/bin/open5gs-dbctl -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54a760d04e6522d843e6d65b94ef6067e502fbaa Gerrit-Change-Number: 34710 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: open5gs-master: Install open5gs-dbctl to /usr/bin
by fixeria 10 Oct '23

10 Oct '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email ) Change subject: open5gs-master: Install open5gs-dbctl to /usr/bin ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54a760d04e6522d843e6d65b94ef6067e502fbaa Gerrit-Change-Number: 34710 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 16:11:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in docker-playground[master]: open5gs-master: Fix indentation
by pespin 10 Oct '23

10 Oct '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34709?usp=email ) Change subject: open5gs-master: Fix indentation ...................................................................... open5gs-master: Fix indentation Use tabs everywhere, as usual with other Dockerfiles (eg. open5gs-latest). Change-Id: Ie4e72f484797ada718915e837cd38be574136631 --- M open5gs-master/Dockerfile 1 file changed, 50 insertions(+), 38 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index fc88f9e..99def99 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -3,56 +3,56 @@ ARG DISTRO FROM $USER/$DISTRO-build -RUN apt-get update && \ - apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive \ - apt-get install -y --no-install-recommends \ - cmake \ - vim \ - sudo \ - iproute2 \ - iputils-ping \ - libcap2-bin \ - net-tools && \ - apt-get clean +RUN apt-get update && \ + apt-get upgrade -y && \ + DEBIAN_FRONTEND=noninteractive \ + apt-get install -y --no-install-recommends \ + cmake \ + vim \ + sudo \ + iproute2 \ + iputils-ping \ + libcap2-bin \ + net-tools && \ + apt-get clean # create a user -ARG username=osmocom -RUN useradd -m ${username} && \ - echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \ - chmod 0440 /etc/sudoers.d/${username} +ARG username=osmocom +RUN useradd -m ${username} && \ + echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \ + chmod 0440 /etc/sudoers.d/${username} -WORKDIR /home/${username} +WORKDIR /home/${username} # clone open5gs -ARG GITHUB_USER=open5gs -ARG GITHUB_REPO=open5gs -ARG OPEN5GS_BRANCH=main -RUN git clone https://github.com/$GITHUB_USER/$GITHUB_REPO +ARG GITHUB_USER=open5gs +ARG GITHUB_REPO=open5gs +ARG OPEN5GS_BRANCH=main +RUN git clone https://github.com/$GITHUB_USER/$GITHUB_REPO # install dependencies specified in debian/control (cache them) -RUN cd $GITHUB_REPO && \ - git checkout $OPEN5GS_BRANCH && \ - apt-get build-dep -y . +RUN cd $GITHUB_REPO && \ + git checkout $OPEN5GS_BRANCH && \ + apt-get build-dep -y . -ADD https://api.github.com/repos/$GITHUB_USER/$GITHUB_REPO/git/refs/heads/$OPEN… /root/open5gs-ver.json +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 +RUN cd $GITHUB_REPO && \ + git fetch && git checkout -f -B $OPEN5GS_BRANCH origin/$OPEN5GS_BRANCH # update installed dependencies, install missing (if any) -RUN cd $GITHUB_REPO && \ - apt-get build-dep -y . +RUN cd $GITHUB_REPO && \ + apt-get build-dep -y . # build + install open5gs -RUN cd $GITHUB_REPO && \ - meson build \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=lib/x86_64-linux-gnu \ - --libexecdir=lib/x86_64-linux-gnu && \ - meson configure build && \ - ninja -C build install +RUN cd $GITHUB_REPO && \ + meson build \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=lib/x86_64-linux-gnu \ + --libexecdir=lib/x86_64-linux-gnu && \ + meson configure build && \ + ninja -C build install -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34709?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie4e72f484797ada718915e837cd38be574136631 Gerrit-Change-Number: 34709 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in docker-playground[master]: open5gs-master: Make mongodb available in the image
by osmith 10 Oct '23

10 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34711?usp=email ) Change subject: open5gs-master: Make mongodb available in the image ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34711?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Id6dde5f54b666279c102eb14fabb87194192c9e4 Gerrit-Change-Number: 34711 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 15:36:07 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: open5gs-master: Install open5gs-dbctl to /usr/bin
by osmith 10 Oct '23

10 Oct '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email ) Change subject: open5gs-master: Install open5gs-dbctl to /usr/bin ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54a760d04e6522d843e6d65b94ef6067e502fbaa Gerrit-Change-Number: 34710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 15:34:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in docker-playground[master]: open5gs-master: Fix indentation
by osmith 10 Oct '23

10 Oct '23

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34709?usp=email ) Change subject: open5gs-master: Fix indentation ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34709?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ie4e72f484797ada718915e837cd38be574136631 Gerrit-Change-Number: 34709 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 10 Oct 2023 15:34:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in docker-playground[master]: WIP: Support debian boowkorm
by pespin 10 Oct '23

10 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34712?usp=email ) Change subject: WIP: Support debian boowkorm ...................................................................... WIP: Support debian boowkorm Change-Id: Ib11a55294b525e3c3806246b133f8e479554a068 --- M open5gs-latest/Dockerfile 1 file changed, 36 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/12/34712/1 diff --git a/open5gs-latest/Dockerfile b/open5gs-latest/Dockerfile index 7c385e2..c395d9c 100644 --- a/open5gs-latest/Dockerfile +++ b/open5gs-latest/Dockerfile @@ -1,8 +1,12 @@ ARG REGISTRY=docker.io -FROM ${REGISTRY}/debian:bullseye +ARG UPSTREAM_DISTRO=debian:bookworm +FROM ${REGISTRY}/${UPSTREAM_DISTRO} +# Arguments used after FROM must be specified again +ARG DISTRO + ARG OPEN5GS_REPO_HOST="https://download.opensuse.org" ARG OPEN5GS_REPO_PATH="repositories/home:/acetcom:/open5gs:" -ARG OPEN5GS_REPO="${OPEN5GS_REPO_HOST}/${OPEN5GS_REPO_PATH}/latest/Debian_11" +ARG OPEN5GS_REPO="${OPEN5GS_REPO_HOST}/${OPEN5GS_REPO_PATH}/latest/Debian_12" ARG OPEN5GS_KEY=/usr/share/keyrings/open5gs-latest.asc ARG MONGODB_KEY=/usr/share/keyrings/mongodb-org.asc @@ -18,13 +22,29 @@ sudo \ wget +RUN wget "https://pgp.mongodb.com/server-5.0.asc" -O "$MONGODB_KEY" +RUN case "$DISTRO" in \ + debian-*) \ + DEBIAN_VERSION=$(echo "$DISTRO" | cut -d "-" -f2); \ + if [ "x${DEBIAN_VERSION}" = "xbookworm" ]; then \ + echo "Using bullseye since bookworm mongodb-org package is not available. Furthermore, manually install required libssl1.1." && \ + DEBIAN_VERSION="bullseye" && \ + wget "http://security.debian.org/debian-security/pool/updates/main/o/openssl/libs…" && \ + dpkg -i "libssl1.1_1.1.1n-0+deb10u6_amd64.deb" && \ + rm "libssl1.1_1.1.1n-0+deb10u6_amd64.deb"; \ + fi; \ + echo "deb [signed-by=$MONGODB_KEY] http://repo.mongodb.org/apt/debian ${DEBIAN_VERSION}/mongodb-org/5.0 main" \ + > /etc/apt/sources.list.d/mongodb-org.list \ + ;; \ + centos*) \ + echo "TODO: centos" && \ + exit 1 \ + ;; \ + esac + RUN echo "deb [signed-by=$OPEN5GS_KEY] $OPEN5GS_REPO/ ./" \ > /etc/apt/sources.list.d/open5gs.list -RUN echo "deb [signed-by=$MONGODB_KEY] http://repo.mongodb.org/apt/debian bullseye/mongodb-org/5.0 main" \ - > /etc/apt/sources.list.d/mongodb-org.list - -RUN wget "$OPEN5GS_REPO/Release.key" -O "$OPEN5GS_KEY" && \ - wget "https://pgp.mongodb.com/server-5.0.asc" -O "$MONGODB_KEY" +RUN wget "$OPEN5GS_REPO/Release.key" -O "$OPEN5GS_KEY" RUN apt-get update && \ apt-get install -y \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34712?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ib11a55294b525e3c3806246b133f8e479554a068 Gerrit-Change-Number: 34712 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in docker-playground[master]: open5gs-master: Install open5gs-dbctl to /usr/bin
by pespin 10 Oct '23

10 Oct '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email ) Change subject: open5gs-master: Install open5gs-dbctl to /usr/bin ...................................................................... open5gs-master: Install open5gs-dbctl to /usr/bin meson install doesn't install that file because it's aimed at developers. However, debian package does install it manually in debian/open5gs-common.install. Hence, the app is available in open5gs-latest docker image, but not in open5gs-master. Manually copy it to /usr/bin to have both behave the same in this aspect. Related: SYS#6588 Change-Id: I54a760d04e6522d843e6d65b94ef6067e502fbaa --- M open5gs-master/Dockerfile 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/10/34710/1 diff --git a/open5gs-master/Dockerfile b/open5gs-master/Dockerfile index 99def99..827d661 100644 --- a/open5gs-master/Dockerfile +++ b/open5gs-master/Dockerfile @@ -55,4 +55,5 @@ --libdir=lib/x86_64-linux-gnu \ --libexecdir=lib/x86_64-linux-gnu && \ meson configure build && \ - ninja -C build install + ninja -C build install && \ + install -m 0755 build/misc/db/open5gs-dbctl /usr/bin/open5gs-dbctl -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/34710?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I54a760d04e6522d843e6d65b94ef6067e502fbaa Gerrit-Change-Number: 34710 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0