summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2022-05-20 09:46:52 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2022-05-20 09:50:17 +0200
commitdb2c03db6c26c1cc54ac2fca55ab2bfbfd7af903 (patch)
treef043dcfc7eaffa329452a53894b7cefa10c214e6
parenteedfd28b728e7e05dff1bec3293272870982d3e2 (diff)
downloadtde-packaging-db2c03db.tar.gz
tde-packaging-db2c03db.zip
RPM: update oss154 build scripts
Signed-off-by: François Andriot <albator78@libertysurf.fr>
-rw-r--r--redhat/docker/oss154/Dockerfile.x86_645
-rw-r--r--redhat/docker/oss154/packages1
2 files changed, 5 insertions, 1 deletions
diff --git a/redhat/docker/oss154/Dockerfile.x86_64 b/redhat/docker/oss154/Dockerfile.x86_64
index 4de243e36..b2bd08902 100644
--- a/redhat/docker/oss154/Dockerfile.x86_64
+++ b/redhat/docker/oss154/Dockerfile.x86_64
@@ -6,10 +6,13 @@ ARG ARCH=x86_64
# Add PACKMAN repository
# Install Trinity build dependencies
COPY packages /packages
-RUN echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
+RUN set -x \
+ && echo PROXY_ENABLED="YES" >>/etc/sysconfig/proxy \
&& echo HTTP_PROXY="http://proxy:3128/" >>/etc/sysconfig/proxy \
+ && rm -fv /etc/zypp/repos.d/repo-sle-* \
&& zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_15.4/ packman \
&& zypper refresh \
+ && zypper -n remove libjpeg62-devel \
&& zypper -n update \
&& zypper -n install -l $(</packages)
diff --git a/redhat/docker/oss154/packages b/redhat/docker/oss154/packages
index aecfd10a2..68265c8db 100644
--- a/redhat/docker/oss154/packages
+++ b/redhat/docker/oss154/packages
@@ -97,6 +97,7 @@ libidn-devel
libiw-devel
libjack-devel
libjasper-devel
+libjpeg8-devel
liblcms2-devel
liblo-devel
liblrdf-devel