diff options
Diffstat (limited to 'redhat/docker/osstw')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 9 | ||||
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.x86_64 | 2 | ||||
| -rw-r--r-- | redhat/docker/osstw/external-packages.sh | 7 | ||||
| -rw-r--r-- | redhat/docker/osstw/packages | 10 |
4 files changed, 14 insertions, 14 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 61bf0f4d9..f7488d9b7 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM opensuse32/tumbleweed:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=i686 # Add PACKMAN repository @@ -30,10 +30,3 @@ RUN set -x \ RUN set -x \ && sudo rpm -Uvh --nodeps https://download.opensuse.org/repositories/network/openSUSE_Tumbleweed/i586/torsocks-2.4.0-15.25.i586.rpm - -# Add lilypond (i686 only) -RUN set -x \ - && rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm \ - && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ - && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ - && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 4498a9573..9d967aa89 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM opensuse/tumbleweed:latest -ARG TDE_VERSION=14.1.4 +ARG TDE_VERSION=14.1.5 ARG ARCH=x86_64 # Add PACKMAN repository diff --git a/redhat/docker/osstw/external-packages.sh b/redhat/docker/osstw/external-packages.sh new file mode 100644 index 000000000..edb7a3116 --- /dev/null +++ b/redhat/docker/osstw/external-packages.sh @@ -0,0 +1,7 @@ +#!/bin/bash -ex + +# Add lilypond (i686 only) +rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.24.4-1.6.src.rpm +sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ +setarch i686 rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ +sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-emmentaler-fonts}"-2"*".rpm" diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index b18437051..a5f6cca04 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -12,6 +12,7 @@ brp-check-suse ccache cdparanoia cdparanoia-devel +checkpolicy chmlib-devel chrpath clamav @@ -35,8 +36,6 @@ docbook2x dssi-devel extractpdfmark fdupes -ffmpeg-4-libavcodec-devel -ffmpeg-4-libavdevice-devel fftw3-devel file-devel findutils @@ -67,12 +66,14 @@ ImageMagick-devel imake imlib2-devel intltool -java-1_8_0-openjdk-devel +java-21-openjdk-devel less libacl-devel libart_lgpl-devel libattr-devel libavahi-devel +libavcodec-devel +libavdevice-devel libblkid-devel libboost_python3-devel libbz2-devel @@ -170,8 +171,6 @@ net-tools net-tools-deprecated NetworkManager-devel ocaml -openexr -openexr-devel opensc openslp-devel opensp-devel @@ -205,6 +204,7 @@ ruby ruby-devel sane-backends-devel scons +selinux-policy-devel shadow speex-devel sqlite3-devel |
