jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-30 14:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10269 from heitbaum/docker12.2

Browse Source 
[le12.2] backport docker changes from master
This commit is contained in:
Matthias Reichl 2025-07-25 00:43:05 +02:00 committed by GitHub
commit 12c9179ed0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/docker/jammy/Dockerfile
View File

@ -22,20 +22,14 @@ RUN apt-get install -y \
wget bash bc gcc-12 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
unzip diffutils lzop make file g++-12 xfonts-utils xsltproc default-jre-headless python3 \
libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
golang-1.22-go git openssh-client rsync \
golang-1.22-go git openssh-client rsync upx-ucl \
--no-install-recommends \
&& ln -s /usr/lib/go-1.22 /usr/lib/go \
&& ln -s /usr/lib/go-1.22/bin/go /usr/bin/go \
&& ln -s /usr/lib/go-1.22/bin/gofmt /usr/bin/gofmt
RUN if [ "$(uname -m)" = "aarch64" ]; then \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' > /etc/apt/sources.list.d/amd64.list; \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \
apt-get update; \
dpkg --add-architecture amd64; \
apt-get install -y libc6:amd64 qemu-user-binfmt --no-install-recommends; \
apt-get install -y libc6-amd64-cross qemu-user-binfmt --no-install-recommends; \
fi
RUN rm -rf /var/lib/apt/lists/*

22
tools/docker/noble/Dockerfile
View File

@ -18,31 +18,25 @@ RUN useradd docker -U -G sudo -m -s /bin/bash \
RUN apt-get update
RUN apt-get install -y \
wget bash bc gcc-13 cpp-13 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
unzip diffutils lzop make file g++-13 xfonts-utils xsltproc default-jre-headless python3 \
wget bash bc gcc-14 cpp-14 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
unzip diffutils lzop make file g++-14 xfonts-utils xsltproc default-jre-headless python3 \
libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
golang-1.23-go git openssh-client rsync \
golang-1.23-go git openssh-client rsync upx-ucl \
--no-install-recommends \
&& ln -s /usr/lib/go-1.23 /usr/lib/go \
&& ln -s /usr/lib/go-1.23/bin/go /usr/bin/go \
&& ln -s /usr/lib/go-1.23/bin/gofmt /usr/bin/gofmt
RUN if [ "$(uname -m)" = "aarch64" ]; then \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse' > /etc/apt/sources.list.d/amd64.list; \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \
echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \
apt-get update; \
dpkg --add-architecture amd64; \
apt-get install -y libc6:amd64 qemu-user-binfmt --no-install-recommends; \
apt-get install -y libc6-amd64-cross qemu-user-binfmt --no-install-recommends; \
fi
RUN rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 \
--slave /usr/bin/cpp cpp /usr/bin/cpp-13 \
--slave /usr/bin/g++ g++ /usr/bin/g++-13 \
--slave /usr/bin/gcov gcov /usr/bin/gcov-13
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 \
--slave /usr/bin/cpp cpp /usr/bin/cpp-14 \
--slave /usr/bin/g++ g++ /usr/bin/g++-14 \
--slave /usr/bin/gcov gcov /usr/bin/gcov-14
RUN update-alternatives --config gcc
USER docker