osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/34544?usp=email )

Change subject: make/Makefile: update DISTRO, UPSTREAM_DISTRO ......................................................................

make/Makefile: update DISTRO, UPSTREAM_DISTRO

Update the Makefile, so it does not pick the wrong base distribution when running make in e.g. osmo-bsc-master directly (without going through ttcn3-*/jenkins.sh as jenkins does).

Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994 --- M make/Makefile 1 file changed, 15 insertions(+), 2 deletions(-)

Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve

diff --git a/make/Makefile b/make/Makefile index 126fd94..f007f2a 100644 --- a/make/Makefile +++ b/make/Makefile @@ -42,8 +42,8 @@ OPEN5GS_BRANCH?=main BUILD_ARGS?= RUN_ARGS?=-it -UPSTREAM_DISTRO?=debian:bullseye -DISTRO?=debian-bullseye +UPSTREAM_DISTRO?=debian:bookworm +DISTRO?=debian-bookworm

# Full OBS repository mirror consists of: # ${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/${OSMOCOM_REPO_VERSION}