osmith has uploaded this change for review.

View Change

OBS: build_srcpkg.Dockerfile: use bookworm

rebar3 is in debian bookworm's repositories, hence it is not needed
anymore to use osmocom:latest here.

Change-Id: Iddd0295ee928fc9a47d4d206e414b78a2561d13d
---
M scripts/obs/data/build_srcpkg.Dockerfile
M scripts/obs/lib/config.py
2 files changed, 17 insertions(+), 15 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/31/34331/1

diff --git a/scripts/obs/data/build_srcpkg.Dockerfile b/scripts/obs/data/build_srcpkg.Dockerfile
index f5d72cd..ebb30cd 100644
--- a/scripts/obs/data/build_srcpkg.Dockerfile
+++ b/scripts/obs/data/build_srcpkg.Dockerfile
@@ -1,29 +1,19 @@
-FROM	debian:bullseye
+# Change distro in lib/config.py:docker_distro_default
+ARG	DISTRO_FROM
+FROM	${DISTRO_FROM}
 ARG	UID
 
 RUN	apt-get update && \
 	apt-get upgrade -y && \
 	apt-get install -y --no-install-recommends \
 		ca-certificates \
-		gnupg2 \
-		&& \
-	apt-get clean
-
-COPY	Release.key /tmp/Release.key
-RUN	apt-key add /tmp/Release.key && \
-	rm /tmp/Release.key && \
-	echo "deb https://downloads.osmocom.org/packages/osmocom:/latest/Debian_11/ ./" \
-		> /etc/apt/sources.list.d/osmocom-latest.list
-
-RUN	apt-get update && \
-	apt-get upgrade -y && \
-	apt-get install -y --no-install-recommends \
 		debhelper \
 		dh-python \
 		dpkg-dev \
 		fakeroot \
 		git \
 		git-review \
+		gnupg2 \
 		meson \
 		osc \
 		python3-setuptools \
diff --git a/scripts/obs/lib/config.py b/scripts/obs/lib/config.py
index 3942f43..c3b172d 100644
--- a/scripts/obs/lib/config.py
+++ b/scripts/obs/lib/config.py
@@ -111,7 +111,7 @@
         "open5gs": "^v[0-9]*\\.[0-9]*\\.[0-9]*$",
 }
 
-docker_distro_default = "debian:11"
+docker_distro_default = "debian:12"
 docker_distro_other = [
     "almalinux:*",  # instead of centos (SYS#5818)
     "debian:*",

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