Skip to content

Commit

Permalink
Allow backports for Debian 9 (install EGL, OpenGL)
Browse files Browse the repository at this point in the history
Signed-off-by: Marcel Bargull <[email protected]>
  • Loading branch information
mbargull committed Oct 16, 2023
1 parent 2b5d90d commit 8846fa2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
4 changes: 2 additions & 2 deletions images/base-glibc-busybox-bash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
ARG debian_version
FROM "debian:${debian_version}-slim" AS build_base
RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \
'/ stretch/ { /-updates/d ; s,/(deb|security)\.,/archive., }' \
'/ stretch/ { s,-updates,-backports, ; s,/(deb|security)\.,/archive., }' \
/etc/apt/sources.list


Expand All @@ -15,7 +15,7 @@ RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \
# Use old Debian version to ensure compatible (low glibc requirement) binaries.
FROM debian:9-slim AS busybox_builder
RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \
'/ stretch/ { /-updates/d ; s,/(deb|security)\.,/archive., }' \
'/ stretch/ { s,-updates,-backports, ; s,/(deb|security)\.,/archive., }' \
/etc/apt/sources.list \
&& \
apt-get update && \
Expand Down
22 changes: 17 additions & 5 deletions images/base-glibc-debian-bash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,28 @@ ARG debian_version

FROM "debian:${debian_version}-slim"
RUN [ ! -f /etc/apt/sources.list ] || sed --in-place= --regexp-extended \
'/ stretch/ { /-updates/d ; s,/(deb|security)\.,/archive., }' \
'/ stretch/ { s,-updates,-backports, ; s,/(deb|security)\.,/archive., }' \
/etc/apt/sources.list \
&& \
apt-get update -qq \
&& \
DEBIAN_FRONTEND=noninteractive \
apt-get install --yes \
--no-install-recommends \
libgl1-mesa-glx \
libegl1 \
apt-get install --yes --no-install-recommends \
$( \
. /etc/os-release \
&& \
[ "${VERSION_ID-10}" -lt 10 ] \
&& \
printf '%s\n' \
libegl1-mesa \
libgl1-mesa-glx \
|| \
printf '%s\n' \
libegl1 \
libgl1 \
libglx-mesa0 \
) \
libglvnd0 \
libopengl0 \
locales \
openssh-client \
Expand Down

0 comments on commit 8846fa2

Please sign in to comment.