diff options
| author | François Andriot <albator78@libertysurf.fr> | 2019-11-03 11:26:19 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2019-11-03 11:26:19 +0100 |
| commit | 096e163b680861784102352fb1883d967f114433 (patch) | |
| tree | 644e72acda6e41be818e63f4b94148837456c8e0 /redhat/docker/f30 | |
| parent | aea1ff0939a3189717eef06cda052860db755ce7 (diff) | |
| download | tde-packaging-096e163b680861784102352fb1883d967f114433.tar.gz tde-packaging-096e163b680861784102352fb1883d967f114433.zip | |
RPM: update docker scripts
Diffstat (limited to 'redhat/docker/f30')
| -rw-r--r-- | redhat/docker/f30/Dockerfile.i686 | 3 | ||||
| -rw-r--r-- | redhat/docker/f30/Dockerfile.x86_64 | 3 | ||||
| -rw-r--r-- | redhat/docker/f30/packages | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/redhat/docker/f30/Dockerfile.i686 b/redhat/docker/f30/Dockerfile.i686 index 66895fd5c..0f8cac39d 100644 --- a/redhat/docker/f30/Dockerfile.i686 +++ b/redhat/docker/f30/Dockerfile.i686 @@ -1,6 +1,6 @@ FROM fedora32:30 -ARG TDE_VERSION=14.0.6 +ARG TDE_VERSION=14.0.7 ARG ARCH=i686 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" @@ -14,7 +14,6 @@ RUN setarch i686 dnf -y --enableplugin=ovl install https://download1.rpmfusion.o # Install Trinity build dependencies RUN setarch i686 dnf -y --enableplugin=ovl update ADD packages /packages -#RUN cat /packages | xargs -n 10 -P 1 setarch i686 dnf -y --enableplugin=ovl install RUN setarch i686 dnf -y --enableplugin=ovl install $(</packages) # Add YUM repository for locally built packages diff --git a/redhat/docker/f30/Dockerfile.x86_64 b/redhat/docker/f30/Dockerfile.x86_64 index 546697d76..b259f4810 100644 --- a/redhat/docker/f30/Dockerfile.x86_64 +++ b/redhat/docker/f30/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:30 -ARG TDE_VERSION=14.0.6 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" @@ -14,7 +14,6 @@ RUN dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedor # Install Trinity build dependencies RUN dnf -y --enableplugin=ovl update ADD packages /packages -#RUN cat /packages | xargs -n 10 -P 1 dnf -y --enableplugin=ovl install RUN dnf -y --enableplugin=ovl install $(</packages) # Add YUM repository for locally built packages diff --git a/redhat/docker/f30/packages b/redhat/docker/f30/packages index 17cd6fcfe..9d2c5eba2 100644 --- a/redhat/docker/f30/packages +++ b/redhat/docker/f30/packages @@ -33,6 +33,7 @@ doxygen dssi-devel esound-devel exempi-devel +exiv2-devel fdupes fedora-rpm-macros ffmpeg-devel @@ -171,9 +172,11 @@ pam-devel pciutils-devel pcre-devel pcsc-lite-devel +pcsc-perl perl perl-devel perl(ExtUtils::MakeMaker) +perl(PAR::Packer) perl(XML::Parser) pilot-link-devel pkcs11-helper-devel |