RPM: update docker/osstw

Signed-off-by: François Andriot <albator78@libertysurf.fr>
pull/118/head
François Andriot 3 years ago
parent 9412a240df
commit c09543aa3d

@ -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 refresh \
&& setarch ${ARCH} zypper -n dup \ && setarch ${ARCH} zypper -n dup \
&& setarch ${ARCH} zypper -n update \ && 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 # Add non-root user to build packages
RUN useradd -m -s /bin/bash -u 1000 trinity \ RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers && 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 USER trinity
COPY rpmmacros /home/trinity/.rpmmacros 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 && sudo zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
# Add GeoIP # 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 && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/*GeoIP*.rpm
# Add lilypond (i686 only) # 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 \ #RUN rpm -ivh https://ftp.lysator.liu.se/pub/opensuse/source/tumbleweed/repo/oss/src/lilypond-2.23.3-3.6.src.rpm \
&& 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" \
&& sed -i "${HOME}/rpmbuild/SPECS/lilypond.spec" -e "/^ExcludeArch/d" \ # && setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec
&& setarch ${ARCH} rpmbuild -ba ~/rpmbuild/SPECS/lilypond.spec

@ -24,8 +24,10 @@ createrepo_c
cups-devel cups-devel
curl curl
cyrus-sasl-devel cyrus-sasl-devel
dblatex
dbus-1-devel dbus-1-devel
dbus-1-glib-devel dbus-1-glib-devel
dejavu-fonts
djvulibre djvulibre
docbook-utils docbook-utils
docbook-xsl-stylesheets docbook-xsl-stylesheets
@ -45,6 +47,7 @@ freetype-devel
fribidi-devel fribidi-devel
gamin-devel gamin-devel
gcc-c++ gcc-c++
ghostscript-fonts-other mftrace
giflib-devel giflib-devel
glu-devel glu-devel
gmime-devel gmime-devel
@ -131,6 +134,7 @@ libtool
libtwolame-devel libtwolame-devel
libudev-devel libudev-devel
libudisks2-0-devel libudisks2-0-devel
libuuid-devel
libv4l-devel libv4l-devel
libvisual-devel libvisual-devel
libvorbis-devel libvorbis-devel
@ -175,8 +179,12 @@ pcsc-lite-devel
perl-PAR-Packer perl-PAR-Packer
perl-pcsc perl-pcsc
pkcs11-helper-devel pkcs11-helper-devel
pkgconfig(guile-1.8)
polkit-devel
postgresql10 postgresql10
postgresql10-devel postgresql10-devel
potrace-devel
ppp
python-devel python-devel
python-gtk-devel python-gtk-devel
python3-devel python3-devel
@ -185,6 +193,7 @@ rpcgen
rpm-build rpm-build
rpm-devel rpm-devel
rsvg-convert rsvg-convert
rsync
ruby ruby
ruby-devel ruby-devel
sane-backends-devel sane-backends-devel
@ -195,16 +204,21 @@ subversion-devel
sudo sudo
swig swig
sword-devel sword-devel
t1utils
texi2html
texinfo
texlive-adjustbox texlive-adjustbox
texlive-etoc texlive-etoc
texlive-hanging texlive-hanging
texlive-metafont-bin texlive-metafont-bin
texlive-metapost
texlive-multirow texlive-multirow
texlive-natbib texlive-natbib
texlive-newunicodechar texlive-newunicodechar
texlive-refman texlive-refman
texlive-sectsty texlive-sectsty
texlive-stackengine texlive-stackengine
texlive-lh
texlive-tocloft texlive-tocloft
torsocks torsocks
transfig transfig
@ -223,3 +237,4 @@ xscreensaver-data
xscreensaver-data-extra xscreensaver-data-extra
xz xz
xz-devel xz-devel
zip

Loading…
Cancel
Save