diff options
| author | François Andriot <albator78@libertysurf.fr> | 2021-05-01 18:08:35 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2021-05-01 18:08:57 +0200 |
| commit | 990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006 (patch) | |
| tree | ac9f156cee3f656da006a59a8f19d8e6c2b1976b /redhat/docker/el6/Dockerfile.i686 | |
| parent | 3abe22ac0a163a1b27d831cbfbe1256b7117ab82 (diff) | |
| download | tde-packaging-990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006.tar.gz tde-packaging-990ec4c1253d7867d3efd9ad98b7fd2a8bbf0006.zip | |
RPM: update docker scripts
Diffstat (limited to 'redhat/docker/el6/Dockerfile.i686')
| -rw-r--r-- | redhat/docker/el6/Dockerfile.i686 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686 index 1f449b0e5..85fd6bc9d 100644 --- a/redhat/docker/el6/Dockerfile.i686 +++ b/redhat/docker/el6/Dockerfile.i686 @@ -9,10 +9,13 @@ ARG ARCH=i686 # Install Trinity build dependencies COPY packages /packages RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \ - && yum -y clean all \ + && rpm -Uvh http://repo/repo/archives/centos/6/os/i386/Packages/wget-1.12-10.el6.i686.rpm \ + && rm -fv /etc/yum.repos.d/*.repo \ + && wget -P /etc/yum.repos.d -nv http://repo/repo/{centos6,epel6}.repo \ + && setarch i686 yum -y clean all \ && setarch i686 yum -y update \ - && setarch i686 yum -y install epel-release \ - && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ + && rm -fv /etc/yum.repos.d/CentOS-*.repo \ + && rpm -Uvh --nodeps https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \ && setarch i686 yum -y install $(</packages) # Add YUM repository for locally built packages @@ -35,7 +38,7 @@ COPY rpmmacros /home/trinity/.rpmmacros # Build supplementary development tools -RUN sudo rpm -Uvh http://repo/trinity/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm +RUN sudo rpm -Uvh http://repo/trinity/current/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm @@ -58,3 +61,11 @@ RUN rpm -i https://fr2.rpmfind.net/linux/epel/7/SRPMS/Packages/p/perl-PAR-Packer && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s|%license|%doc|" -e "/^make test/ s|^|#|" \ && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm --nodeps + +RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/c/cln-1.3.4-1.el7.src.rpm \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/cln.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cln{,-devel}-1*.rpm + +RUN rpm -i https://dl.fedoraproject.org/pub/epel/7/SRPMS/Packages/l/libqalculate-0.9.7-7.el7.src.rpm \ + && setarch i686 rpmbuild -ba ${HOME}/rpmbuild/SPECS/libqalculate.spec \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/libqalculate{,-devel}-0*.rpm |