diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-04-29 12:02:06 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-04-29 12:02:06 +0200 |
| commit | b332f55f7b5723a8b08112fb4623d216d009f1e8 (patch) | |
| tree | 7199472f1a34d3605e8e35c7548ac5fff2e9a5f2 | |
| parent | 79e3b92c4f28f8d1af18f061225ecb3490fd0a38 (diff) | |
| download | tde-packaging-b332f55f7b5723a8b08112fb4623d216d009f1e8.tar.gz tde-packaging-b332f55f7b5723a8b08112fb4623d216d009f1e8.zip | |
RPM: update docker scripts
Signed-off-by: François Andriot <albator78@libertysurf.fr>
| -rw-r--r-- | redhat/docker/el8/packages | 3 | ||||
| -rw-r--r-- | redhat/docker/f33/Dockerfile.x86_64 | 8 | ||||
| -rw-r--r-- | redhat/docker/f33/packages | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/redhat/docker/el8/packages b/redhat/docker/el8/packages index 8cff5b2a9..be1422086 100644 --- a/redhat/docker/el8/packages +++ b/redhat/docker/el8/packages @@ -16,6 +16,7 @@ cdparanoia-devel chrpath clamav clamav-devel +cln-devel clucene-core-devel cmake cpp @@ -104,6 +105,7 @@ libogg-devel libotr-devel libpaper-devel libpcap-devel +libqalculate-devel libraw1394-devel librsvg2-tools librsync-devel @@ -215,4 +217,5 @@ wireless-tools-devel xine-lib-devel xmlto xorg-x11-font-utils +xscreensaver xz-devel diff --git a/redhat/docker/f33/Dockerfile.x86_64 b/redhat/docker/f33/Dockerfile.x86_64 index d9e3ba04b..3768caa42 100644 --- a/redhat/docker/f33/Dockerfile.x86_64 +++ b/redhat/docker/f33/Dockerfile.x86_64 @@ -20,7 +20,15 @@ RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${T # Fix utempter detection RUN chmod a+r /usr/libexec/utempter/utempter +RUN chmod 777 /tmp + # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers + +USER trinity COPY rpmmacros /home/trinity/.rpmmacros + +RUN rpm -i http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/releases/33/Everything/source/tree/Packages/p/python-exif-2.2.1-1.fc33.src.rpm \ + && rpmbuild -ba ${HOME}/rpmbuild/SPECS/python-exif.spec --define "py2 1" \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/noarch/python2-exif-* diff --git a/redhat/docker/f33/packages b/redhat/docker/f33/packages index d0532b160..2839b6997 100644 --- a/redhat/docker/f33/packages +++ b/redhat/docker/f33/packages @@ -192,6 +192,7 @@ postgresql-server-devel ppp pulseaudio-libs-devel python +python2-setuptools python3-devel qt4-devel recode |