diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-09-04 21:44:28 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-09-04 21:44:28 +0200 |
| commit | 8d17db2e0995db07518fec7e5fd3a568e9da769c (patch) | |
| tree | 8ff3b3ae40b3e2a6bd29ce98b02b896da0bb3647 /redhat/docker/f28 | |
| parent | ce92126deea3247ae8daddc4427a081ac44504e1 (diff) | |
| download | tde-packaging-8d17db2e0995db07518fec7e5fd3a568e9da769c.tar.gz tde-packaging-8d17db2e0995db07518fec7e5fd3a568e9da769c.zip | |
RPM: update packages for PCLinuxOS 2018
Diffstat (limited to 'redhat/docker/f28')
| -rw-r--r-- | redhat/docker/f28/Dockerfile.i686 | 6 | ||||
| -rw-r--r-- | redhat/docker/f28/Dockerfile.x86_64 | 3 | ||||
| -rw-r--r-- | redhat/docker/f28/packages | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/redhat/docker/f28/Dockerfile.i686 b/redhat/docker/f28/Dockerfile.i686 index ccb8d9fce..1927d264b 100644 --- a/redhat/docker/f28/Dockerfile.i686 +++ b/redhat/docker/f28/Dockerfile.i686 @@ -1,9 +1,9 @@ FROM fedora32:28 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.5 ARG ARCH=i686 -RUN echo "proxy=http://192.168.111.249:3128" >>"/etc/yum.conf" +RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" # Add RPMFUSION repository RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-28.noarch.rpm @@ -11,7 +11,7 @@ RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release- # Install Trinity build dependencies RUN setarch i686 dnf update -y ADD packages /packages -#RUN setarch i686 dnf install -y texlive-base +RUN touch /var/lib/rpm/* RUN setarch i686 dnf install -y $(</packages) # Add YUM repository for locally built packages diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64 index dc5e685c8..6c26addda 100644 --- a/redhat/docker/f28/Dockerfile.x86_64 +++ b/redhat/docker/f28/Dockerfile.x86_64 @@ -1,6 +1,6 @@ FROM fedora:28 -ARG TDE_VERSION=14.0.4 +ARG TDE_VERSION=14.0.5 ARG ARCH=x86_64 RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" @@ -11,6 +11,7 @@ RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release- # Install Trinity build dependencies RUN dnf update -y ADD packages /packages +RUN touch /var/lib/rpm/* RUN dnf install -y $(</packages) # Add YUM repository for locally built packages diff --git a/redhat/docker/f28/packages b/redhat/docker/f28/packages index 38e58b3cb..6ada73c34 100644 --- a/redhat/docker/f28/packages +++ b/redhat/docker/f28/packages @@ -35,6 +35,7 @@ esound-devel exempi-devel exiv2-devel fdupes +fedora-rpm-macros ffmpeg-devel fftw-devel file-devel |