diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2023-09-05 13:28:56 +0200 |
|---|---|---|
| committer | osmith <osmith@sysmocom.de> | 2023-09-08 09:06:57 +0000 |
| commit | 18c730fc102d7d135f598e76598aa2784d972d1b (patch) | |
| tree | 37af046e92da40414d0b8117c5415772de4edb2b | |
| parent | 4f538b554ae0ccbd6726d6d577352be998bdd6a4 (diff) | |
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
| -rw-r--r-- | scripts/obs/data/build_srcpkg.Dockerfile | 18 | ||||
| -rw-r--r-- | scripts/obs/lib/config.py | 2 |
2 files changed, 5 insertions, 15 deletions
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 @@ git_latest_tag_pattern_other = { "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:*", |