François Andriot
5 years ago
parent
1c0f7ee5ef
commit
191dbe0c32
@ -1,25 +1,31 @@
|
||||
FROM opensuse32/tumbleweed:latest
|
||||
|
||||
ARG TDE_VERSION=14.0.7
|
||||
ARG TDE_VERSION=14.0.8
|
||||
ARG ARCH=i686
|
||||
|
||||
# Add PACKMAN repository
|
||||
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
|
||||
RUN setarch ${ARCH} zypper refresh
|
||||
RUN setarch ${ARCH} zypper --non-interactive dup
|
||||
RUN setarch ${ARCH} zypper --non-interactive update
|
||||
|
||||
# Install Trinity build dependencies
|
||||
ADD packages /packages
|
||||
RUN setarch ${ARCH} zypper install -l -y $(</packages)
|
||||
RUN setarch ${ARCH} zypper refresh \
|
||||
&& setarch ${ARCH} zypper -n dup \
|
||||
&& setarch ${ARCH} zypper -n update \
|
||||
&& setarch ${ARCH} zypper -n install $(</packages)
|
||||
|
||||
# Add non-root user to build packages
|
||||
RUN useradd -m -s /bin/bash -u 1000 trinity
|
||||
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
|
||||
RUN useradd -m -s /bin/bash -u 1000 trinity \
|
||||
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
|
||||
|
||||
USER trinity
|
||||
ADD rpmmacros /home/trinity/.rpmmacros
|
||||
|
||||
# Add YUM repository for locally built packages
|
||||
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
|
||||
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
|
||||
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
|
||||
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
|
||||
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
|
||||
|
||||
# Build supplementary packages
|
||||
RUN rpm -Uvh https://ftp.gwdg.de/pub/opensuse/repositories/graphics/openSUSE_Factory/src/jasper-2.0.16-260.4.src.rpm \
|
||||
&& sed -i "${HOME}/rpmbuild/SPECS/jasper.spec" -e "/^%cmake / s|$| -DJAS_ENABLE_DOC=False|" \
|
||||
&& setarch ${ARCH} rpmbuild -ba "${HOME}/rpmbuild/SPECS/jasper.spec" \
|
||||
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/libjasper{4,-devel}-2*.rpm /home/trinity/rpmbuild/RPMS/*/jasper-2*.rpm
|
||||
|
||||
@ -1,25 +1,31 @@
|
||||
FROM opensuse/tumbleweed:latest
|
||||
|
||||
ARG TDE_VERSION=14.0.7
|
||||
ARG TDE_VERSION=14.0.8
|
||||
ARG ARCH=x86_64
|
||||
|
||||
# Add PACKMAN repository
|
||||
RUN zypper ar -f -G -n packman http://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Tumbleweed/ packman
|
||||
RUN zypper refresh
|
||||
RUN zypper --non-interactive dup
|
||||
RUN zypper --non-interactive update
|
||||
|
||||
# Install Trinity build dependencies
|
||||
ADD packages /packages
|
||||
RUN zypper install -l -y $(</packages)
|
||||
RUN zypper refresh \
|
||||
&& zypper -n dup \
|
||||
&& zypper -n update \
|
||||
&& zypper -n install $(</packages)
|
||||
|
||||
# Add non-root user to build packages
|
||||
RUN useradd -m -s /bin/bash -u 1000 trinity
|
||||
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
|
||||
RUN useradd -m -s /bin/bash -u 1000 trinity \
|
||||
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>/etc/sudoers
|
||||
|
||||
USER trinity
|
||||
ADD rpmmacros /home/trinity/.rpmmacros
|
||||
|
||||
# Add YUM repository for locally built packages
|
||||
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
|
||||
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/${ARCH} rpmbuild.${ARCH}
|
||||
RUN mkdir -p /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
|
||||
RUN zypper ar -C -G /home/trinity/rpmbuild/RPMS.tde-${TDE_VERSION}/noarch rpmbuild.noarch
|
||||
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
|
||||
|
||||
# Build supplementary packages
|
||||
RUN rpm -Uvh https://ftp.gwdg.de/pub/opensuse/repositories/graphics/openSUSE_Factory/src/jasper-2.0.16-260.4.src.rpm \
|
||||
&& sed -i "${HOME}/rpmbuild/SPECS/jasper.spec" -e "/^%cmake / s|$| -DJAS_ENABLE_DOC=False|" \
|
||||
&& rpmbuild -ba "${HOME}/rpmbuild/SPECS/jasper.spec" \
|
||||
&& sudo rpm -Uvh /home/trinity/rpmbuild/RPMS/*/libjasper{4,-devel}-2*.rpm /home/trinity/rpmbuild/RPMS/*/jasper-2*.rpm
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
%dist .osstw
|
||||
%_smp_mflags -j8
|
||||
%jobs 8
|
||||
%__python %__python2
|
||||
|
||||
@ -1,49 +1,48 @@
|
||||
FROM pclinuxos:2018
|
||||
|
||||
ARG TDE_VERSION=14.0.7
|
||||
ARG TDE_VERSION=14.0.8
|
||||
ARG ARCH=x86_64
|
||||
|
||||
# Update distribution
|
||||
RUN apt-get -y update
|
||||
RUN apt-get -y install glibc
|
||||
RUN apt-get -y dist-upgrade
|
||||
RUN apt-get -y update && apt-get -y install glibc && apt-get -y dist-upgrade
|
||||
|
||||
# Install Trinity build dependencies
|
||||
ADD packages.${ARCH} /packages
|
||||
RUN apt-get -y install $(</packages)
|
||||
RUN apt-get -y update && apt-get -y install $(</packages)
|
||||
|
||||
# Add rpmbuild repositories
|
||||
ADD rpmbuild.list /etc/apt/sources.list.d/rpmbuild.list
|
||||
RUN sed -i "/etc/apt/sources.list.d/rpmbuild.list" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
|
||||
|
||||
# Fix SUDO configuration
|
||||
RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
|
||||
#RUN sed -i "/etc/pam.d/sudo" -e "/pam_limits.so/ s|^|#|"
|
||||
|
||||
# Fix utempter detection
|
||||
RUN chmod a+r /usr/libexec/utempter/utempter
|
||||
|
||||
# Fix missing '.la' files
|
||||
ADD genla.sh /usr/bin/genla.sh
|
||||
RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64
|
||||
RUN genla.sh libjpeg
|
||||
RUN genla.sh liblcms
|
||||
RUN genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
|
||||
RUN genla.sh libbluetooth && mv /usr/lib64/libbluetooth.la /lib64 \
|
||||
&& genla.sh libjpeg \
|
||||
&& genla.sh liblcms \
|
||||
&& genla.sh libusb-1.0 && mv /usr/lib64/libusb-1.0.la /lib64 && cp /lib64/libusb-1.0.la /lib64/libusb.la
|
||||
|
||||
# Add non-root user to build packages
|
||||
RUN rm -rf /home/trinity
|
||||
RUN useradd -m -s /bin/bash -u 1000 trinity
|
||||
RUN echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
|
||||
RUN rm -rf /home/trinity && useradd -m -s /bin/bash -u 1000 trinity && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
|
||||
|
||||
USER trinity
|
||||
ADD rpmmacros /home/trinity/.rpmmacros
|
||||
|
||||
# Build supplementary development tools
|
||||
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm
|
||||
RUN sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|"
|
||||
RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec
|
||||
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/torsocks-2*.rpm
|
||||
|
||||
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm
|
||||
RUN sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|"
|
||||
RUN rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
|
||||
RUN sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm
|
||||
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/torsocks-2.3.0-1.mga7.src.rpm \
|
||||
&& sed -i ${HOME}/rpmbuild/SPECS/torsocks.spec -e "s|%license|%doc|" \
|
||||
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/torsocks.spec
|
||||
|
||||
RUN rpm -i http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/7.1/SRPMS/core/release/cscope-15.9-1.mga7.src.rpm \
|
||||
&& sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s|%autopatch|%patch0|" \
|
||||
&& rpmbuild -ba ${HOME}/rpmbuild/SPECS/cscope.spec
|
||||
|
||||
USER root
|
||||
RUN rpm -Uvh /home/trinity/rpmbuild/RPMS/*/torsocks-2*.rpm /home/trinity/rpmbuild/RPMS/*/cscope-15*.rpm
|
||||
|
||||
USER trinity
|
||||
|
||||
Loading…
Reference in new issue