summaryrefslogtreecommitdiffstats
path: root/redhat/docker/osstw
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-05-13 13:33:36 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2018-05-13 13:34:18 +0200
commit35859abe41040ab12ea19636471ec6fc0e7686e2 (patch)
tree2997b9547715e9711ea22ae615d20316c6a4e53a /redhat/docker/osstw
parent9512efc10de55c5689f398107df14ae96670932e (diff)
downloadtde-packaging-35859abe41040ab12ea19636471ec6fc0e7686e2.tar.gz
tde-packaging-35859abe41040ab12ea19636471ec6fc0e7686e2.zip
RPM packaging: updates for Fedora 28 / OpenSUSE 15.0
Diffstat (limited to 'redhat/docker/osstw')
-rw-r--r--redhat/docker/osstw/Dockerfile.i6867
-rw-r--r--redhat/docker/osstw/Dockerfile.x86_647
-rw-r--r--redhat/docker/osstw/packages18
3 files changed, 21 insertions, 11 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686
index 2cd3171c7..e62321a73 100644
--- a/redhat/docker/osstw/Dockerfile.i686
+++ b/redhat/docker/osstw/Dockerfile.i686
@@ -6,11 +6,12 @@ ARG ARCH=i686
# Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
RUN setarch ${ARCH} zypper refresh
+RUN setarch ${ARCH} zypper --non-interactive dup
+RUN setarch ${ARCH} zypper --non-interactive update
# Install Trinity build dependencies
-ADD packages /etc/zypp/packages
-RUN setarch ${ARCH} zypper remove -y openssl
-RUN setarch ${ARCH} zypper install -l -y $(</etc/zypp/packages)
+ADD packages /packages
+RUN setarch ${ARCH} zypper install -l -y $(</packages)
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64
index eadab8f65..a4f5d7552 100644
--- a/redhat/docker/osstw/Dockerfile.x86_64
+++ b/redhat/docker/osstw/Dockerfile.x86_64
@@ -6,11 +6,12 @@ ARG ARCH=x86_64
# Add PACKMAN repository
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
RUN zypper refresh
+RUN zypper --non-interactive dup
+RUN zypper --non-interactive update
# Install Trinity build dependencies
-ADD packages /etc/zypp/packages
-RUN zypper remove -y openssl
-RUN zypper install -l -y $(</etc/zypp/packages)
+ADD packages /packages
+RUN zypper install -l -y $(</packages)
# Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 4af3c361a..ab1f81b10 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -12,9 +12,9 @@ ccache
cdparanoia
cdparanoia-devel
chmlib-devel
-cln-devel
chrpath
clamav
+cln-devel
clucene-core-devel
cmake
createrepo
@@ -33,6 +33,7 @@ fftw3-devel
file-devel
flac-devel
flex
+font-util
freetype-devel
fribidi-devel
gamin-devel
@@ -54,6 +55,7 @@ htdig
html2ps
hunspell-devel
ImageMagick-devel
+imake
imlib2-devel
intltool
java-1_8_0-openjdk-devel
@@ -73,6 +75,7 @@ libdb-4_8-devel
libdvdread-devel
libexempi-devel
libexiv2-devel
+libfontenc-devel
libgadu-devel
libgpgme-devel
libgphoto2-devel
@@ -94,8 +97,8 @@ libmtp-devel
libmusicbrainz-devel
libneon-devel
libnjb-devel
-libopenssl-1_1_0-devel
libofx-devel
+libopenssl-devel
libotr-devel
libpisock-devel
libpng16-devel
@@ -115,13 +118,19 @@ libtiff-devel
libtool
libtwolame-devel
libudev-devel
+libudisks2-devel
libv4l-devel
libvisual-devel
libvorbis-devel
libwmf-devel
libwpd-devel
+libXdmcp-devel
libxine-devel
+libxkbfile-devel
+libXScrnSaver-devel
libxslt-devel
+libXt-devel
+libXtst-devel
lilo
lirc-devel
make
@@ -136,7 +145,7 @@ openexr-devel
opensc
openslp-devel
opensp-devel
-openssl-1_1_0
+openssl
pam-devel
patch
pciutils-devel
@@ -147,7 +156,7 @@ postgresql
postgresql-devel
python-devel
python-sip-devel
-recode
+rpcgen
rpm-build
rsvg-view
ruby
@@ -162,7 +171,6 @@ swig
sword-devel
torsocks
transfig
-udisks2-devel
unixODBC-devel
update-desktop-files
usbutils