summaryrefslogtreecommitdiffstats
path: root/redhat/docker/osstw/Dockerfile.i686
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2018-05-13 13:33:36 +0200
committerFrançois Andriot <[email protected]>2018-05-13 13:34:18 +0200
commit35859abe41040ab12ea19636471ec6fc0e7686e2 (patch)
tree2997b9547715e9711ea22ae615d20316c6a4e53a /redhat/docker/osstw/Dockerfile.i686
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/Dockerfile.i686')
-rw-r--r--redhat/docker/osstw/Dockerfile.i6867
1 files changed, 4 insertions, 3 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