diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-05-20 09:46:52 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-05-20 09:47:49 +0200 |
| commit | 76b329890650f4eb4ef0f06572d21965f99cc2e0 (patch) | |
| tree | b55db4ba69dedfe32ec0d891a9cca8205f24da65 | |
| parent | 91babb7eb25680700469c33154c14d26bf0bf5a5 (diff) | |
| download | tde-packaging-76b329890650f4eb4ef0f06572d21965f99cc2e0.tar.gz tde-packaging-76b329890650f4eb4ef0f06572d21965f99cc2e0.zip | |
RPM: update oss154 build scripts
Signed-off-by: François Andriot <albator78@libertysurf.fr>
| -rw-r--r-- | redhat/docker/oss154/Dockerfile.x86_64 | 5 | ||||
| -rw-r--r-- | redhat/docker/oss154/packages | 1 |
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 |