osmith submitted this change.

View Change


Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve
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(-)

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}

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

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I31b2a1b8c70b973f4ec0f93d6e9e5e417afec994
Gerrit-Change-Number: 34544
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged