diff options
| author | François Andriot <albator78@libertysurf.fr> | 2020-10-11 22:55:54 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2020-10-11 22:56:18 +0200 |
| commit | 07c298ecad0eb6d37d8914bff91f40328b20a9cd (patch) | |
| tree | 5b65116ec7ce9d393a45ddbd6d9583f3c73ac18d /redhat/docker/el7 | |
| parent | 8e1c5fc5b8ba0eceb6dcf671f6b5b8acd44a1c43 (diff) | |
| download | tde-packaging-07c298ecad0eb6d37d8914bff91f40328b20a9cd.tar.gz tde-packaging-07c298ecad0eb6d37d8914bff91f40328b20a9cd.zip | |
RPM: updates for future 14.0.9 release
Diffstat (limited to 'redhat/docker/el7')
| -rw-r--r-- | redhat/docker/el7/Dockerfile.x86_64 | 17 | ||||
| -rw-r--r-- | redhat/docker/el7/packages | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/redhat/docker/el7/Dockerfile.x86_64 b/redhat/docker/el7/Dockerfile.x86_64 index 7693ded63..5d1a2e4cd 100644 --- a/redhat/docker/el7/Dockerfile.x86_64 +++ b/redhat/docker/el7/Dockerfile.x86_64 @@ -4,23 +4,20 @@ ARG TDE_VERSION=14.0.8 ARG ARCH=x86_64 # Enable proxy -RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" - # Add EPEL repository # Add RPMFUSION repository -RUN rpm -Uvh \ - https://fr2.rpmfind.net/linux/epel/7/x86_64/Packages/e/epel-release-7-12.noarch.rpm \ - https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm - # Install Trinity build dependencies -ADD packages /packages -RUN yum -y clean all \ +COPY packages /packages +RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ + && yum -y install epel-release \ + && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm \ + && yum -y clean all \ && yum -y update \ && yum -y install $(</packages) # Add YUM repository for locally built packages WORKDIR /etc/yum.repos.d -ADD rpmbuild.repo rpmbuild.repo +COPY rpmbuild.repo rpmbuild.repo RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" # Fix utempter detection @@ -34,7 +31,7 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" USER trinity -ADD rpmmacros /home/trinity/.rpmmacros +COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools diff --git a/redhat/docker/el7/packages b/redhat/docker/el7/packages index efc202d44..7368877e2 100644 --- a/redhat/docker/el7/packages +++ b/redhat/docker/el7/packages @@ -174,6 +174,7 @@ pkcs11-helper-devel pkgconfig(pygtk-2.0) poppler-devel postgresql-devel +ppp pth-devel pulseaudio-libs-devel qt-devel |