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/el7 | |
| parent | aea1ff0939a3189717eef06cda052860db755ce7 (diff) | |
| download | tde-packaging-096e163b680861784102352fb1883d967f114433.tar.gz tde-packaging-096e163b680861784102352fb1883d967f114433.zip | |
RPM: update docker scripts
Diffstat (limited to 'redhat/docker/el7')
| -rw-r--r-- | redhat/docker/el7/Dockerfile.x86_64 | 12 | ||||
| -rw-r--r-- | redhat/docker/el7/packages | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 23b191982..92e926cd7 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -1,10 +1,10 @@ FROM centos:7 -ARG TDE_VERSION=14.0.5 +ARG TDE_VERSION=14.0.7 ARG ARCH=x86_64 # Add EPEL repository -RUN rpm -Uvh https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-11.noarch.rpm +RUN yum -y install epel-release # Add NUX repository RUN rpm -Uvh http://li.nux.ro/download/nux/dextop/el7/x86_64/nux-dextop-release-0-5.el7.nux.noarch.rpm @@ -18,10 +18,12 @@ RUN yum install -y $(</packages) ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" +# Distro-specific patches +RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" + # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers -ADD rpmmacros /home/trinity/.rpmmacros -# Distro-specific patches -RUN sed -i "/usr/include/jasper/jas_math.h" -e "/#include <stdint.h>/ s|$|\n#ifndef SIZE_MAX\n#define SIZE_MAX ((size_t) -1)\n#endif\n|" +USER trinity +ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index 393dff1b5..57d04e7f0 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -105,6 +105,7 @@ libofx-devel libogg-devel libotr-devel libpaper-devel +libpcap-devel libqalculate-devel libraw1394-devel librsvg2-tools @@ -155,9 +156,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 |