diff options
| author | François Andriot <albator78@libertysurf.fr> | 2020-06-01 19:01:43 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2020-06-01 19:02:06 +0200 |
| commit | 191dbe0c32b56e88be8e5253f65833470e2eee0a (patch) | |
| tree | d72ef16536e261dae673c3049a20eb3eeeca18ac /redhat/docker/osstw/Dockerfile.x86_64 | |
| parent | 1c0f7ee5ef66d92c671fbeaac96faeffb1a8992d (diff) | |
| download | tde-packaging-191dbe0c32b56e88be8e5253f65833470e2eee0a.tar.gz tde-packaging-191dbe0c32b56e88be8e5253f65833470e2eee0a.zip | |
RPM: update build scripts
Diffstat (limited to 'redhat/docker/osstw/Dockerfile.x86_64')
| -rw-r--r-- | redhat/docker/osstw/Dockerfile.x86_64 | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/redhat/docker/osstw/Dockerfile.x86_64 b/redhat/docker/osstw/Dockerfile.x86_64 index 42d7007c3..82bb96ca3 100644 --- a/redhat/docker/osstw/Dockerfile.x86_64 +++ b/redhat/docker/osstw/Dockerfile.x86_64 @@ -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 |