diff options
| author | François Andriot <albator78@libertysurf.fr> | 2022-05-12 16:04:56 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2022-05-15 09:23:34 +0200 |
| commit | e858b3aaf2f449a46c3cbaaa7423289bba9635e3 (patch) | |
| tree | 684dc141c6ca988616325b6ac219ec410a9ea262 /redhat/docker/osstw/Dockerfile.i686 | |
| parent | 54bd4f2bec4944f18827f1557b18ff316dea153e (diff) | |
| download | tde-packaging-e858b3aaf2f449a46c3cbaaa7423289bba9635e3.tar.gz tde-packaging-e858b3aaf2f449a46c3cbaaa7423289bba9635e3.zip | |
RPM: update docker/osstw
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/docker/osstw/Dockerfile.i686')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.i686 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/redhat/docker/osstw/Dockerfile.i686 b/redhat/docker/osstw/Dockerfile.i686 index 384e805c2..bb8a72e4d 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 @@ -26,11 +29,10 @@ RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} \ && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch # Add GeoIP -RUN 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 \ +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 setarch ${ARCH} sudo zypper -n install dblatex fontforge ghostscript-fonts-other mftrace "pkgconfig(guile-1.8)" potrace-devel t1utils texi2html texlive-lh texinfo \ - && rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-2.1.src.rpm \ - && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ - && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec +#RUN rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.6.src.rpm \ +# && sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ +# && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec |