diff options
Diffstat (limited to 'redhat/docker/osstw/Dockerfile.i686')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 9b74d32ec..ec076eabd 100644 --- a/redhat/docker/osstw/Dockerfile.i686 +++ b/redhat/docker/osstw/Dockerfile.i686 @@ -10,12 +10,15 @@ RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/op && setarch ${ARCH} zypper -n refresh \ && setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n update \ - && setarch ${ARCH} zypper -n install $(</packages) + && setarch ${ARCH} zypper -n install --allow-vendor-change $(</packages) # Add non-root user to build packages RUN useradd -m -s /bin/bash -u 1000 trinity \ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers +# Fix postgresql +RUN ln -sfv /usr/lib/postgresql10/bin/pg_config /usr/bin/pg_config + USER trinity COPY rpmmacros /home/trinity/.rpmmacros @@ -24,3 +27,13 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH} \ && mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch + +# Add GeoIP +RUN setarch ${ARCH} rpmbuild --rebuild https://ftp.lysator.liu.se/pub/opensuse/source/distribution/leap/15.3/repo/oss/src/GeoIP-1.6.12-6.3.1.src.rpm \ + && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm + +# Add lilypond (i686 only) +RUN rpm -Uvh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.9.src.rpm \ + && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ + && setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/lilypond.spec" \ + && sudo rpm -Uvh "${HOME}/rpmbuild/RPMS/"*"/lilypond"{,-fonts-common,-texgy-fonts,-emmentaler-fonts}"-2"*".rpm" |