diff options
author | François Andriot <albator78@libertysurf.fr> | 2018-06-18 22:06:01 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2018-06-19 20:11:02 +0200 |
commit | 3f0ae4ce7e948c666db00647454b4ec32d796768 (patch) | |
tree | bc7fb93a7c0986c8b749cfb9b50837aa189535e7 /redhat/docker | |
parent | a5fdb0ea69d56f6d5a68e8a38fc72e367b797464 (diff) | |
download | tde-packaging-3f0ae4ce7e948c666db00647454b4ec32d796768.tar.gz tde-packaging-3f0ae4ce7e948c666db00647454b4ec32d796768.zip |
RPM: update build scripts
Diffstat (limited to 'redhat/docker')
-rw-r--r-- | redhat/docker/f28/Dockerfile.x86_64 | 2 | ||||
-rw-r--r-- | redhat/docker/oss150/packages | 1 | ||||
-rw-r--r-- | redhat/docker/osstw/packages | 12 |
3 files changed, 9 insertions, 6 deletions
diff --git a/redhat/docker/f28/Dockerfile.x86_64 b/redhat/docker/f28/Dockerfile.x86_64 index 44f7d21eb..dc5e685c8 100644 --- a/redhat/docker/f28/Dockerfile.x86_64 +++ b/redhat/docker/f28/Dockerfile.x86_64 @@ -3,7 +3,7 @@ FROM fedora:28 ARG TDE_VERSION=14.0.4 ARG ARCH=x86_64 -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 diff --git a/redhat/docker/oss150/packages b/redhat/docker/oss150/packages index aa2be744d..9a9ffe93c 100644 --- a/redhat/docker/oss150/packages +++ b/redhat/docker/oss150/packages @@ -58,6 +58,7 @@ ImageMagick-devel imlib2-devel intltool java-1_8_0-openjdk-devel +less libacl-devel libart_lgpl-devel libavahi-devel diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages index ab1f81b10..68478e1a4 100644 --- a/redhat/docker/osstw/packages +++ b/redhat/docker/osstw/packages @@ -28,7 +28,6 @@ docbook-xsl-stylesheets doxygen GraphicsMagick dssi-devel fdupes -ffmpeg-devel fftw3-devel file-devel flac-devel @@ -59,6 +58,7 @@ imake imlib2-devel intltool java-1_8_0-openjdk-devel +less libacl-devel libart_lgpl-devel libavahi-devel @@ -97,6 +97,7 @@ libmtp-devel libmusicbrainz-devel libneon-devel libnjb-devel +libnsl-devel libofx-devel libopenssl-devel libotr-devel @@ -115,10 +116,11 @@ libsndfile-devel libtag-devel libtheora-devel libtiff-devel +libtirpc-devel libtool libtwolame-devel libudev-devel -libudisks2-devel +libudisks2-0-devel libv4l-devel libvisual-devel libvorbis-devel @@ -127,10 +129,12 @@ libwpd-devel libXdmcp-devel libxine-devel libxkbfile-devel -libXScrnSaver-devel +libXmu-devel libxslt-devel +libXss-devel libXt-devel libXtst-devel +libXxf86dga-devel lilo lirc-devel make @@ -155,7 +159,6 @@ pkcs11-helper-devel postgresql postgresql-devel python-devel -python-sip-devel rpcgen rpm-build rsvg-view @@ -168,7 +171,6 @@ sqlite3-devel subversion-devel sudo swig -sword-devel torsocks transfig unixODBC-devel |