diff options
author | François Andriot <albator78@libertysurf.fr> | 2017-07-25 18:36:32 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2017-07-25 18:36:32 +0200 |
commit | 2a9e6e2053407cd126bf1154086f3ca170c7d5a9 (patch) | |
tree | 0bc55a768492922ffffc01167dd96624d8384f93 /redhat/docker/f26 | |
parent | a166e45221dabbf06d176ce3186e5f52b1549a1f (diff) | |
download | tde-packaging-2a9e6e2053407cd126bf1154086f3ca170c7d5a9.tar.gz tde-packaging-2a9e6e2053407cd126bf1154086f3ca170c7d5a9.zip |
RPM packaging: update build scripts
Diffstat (limited to 'redhat/docker/f26')
-rw-r--r-- | redhat/docker/f26/Dockerfile.i686 | 21 | ||||
-rw-r--r-- | redhat/docker/f26/Dockerfile.x86_64 (renamed from redhat/docker/f26/Dockerfile) | 0 | ||||
-rw-r--r-- | redhat/docker/f26/packages | 1 |
3 files changed, 22 insertions, 0 deletions
diff --git a/redhat/docker/f26/Dockerfile.i686 b/redhat/docker/f26/Dockerfile.i686 new file mode 100644 index 000000000..ea78581fa --- /dev/null +++ b/redhat/docker/f26/Dockerfile.i686 @@ -0,0 +1,21 @@ +FROM fedora32:26 + +ARG TDE_VERSION=14.0.4 +ARG ARCH=i686 + +# Add RPMFUSION repository +RUN rpm -Uvh https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-26.noarch.rpm + +# Install Trinity build dependencies +ADD packages /etc/yum.repos.d/packages +RUN setarch i686 dnf update -y +RUN setarch i686 dnf install -y $(</etc/yum.repos.d/packages) + +# Add YUM repository for locally built packages +ADD rpmbuild.repo /etc/yum.repos.d/rpmbuild.repo +RUN sed -i "/etc/yum.repos.d/rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g" + +# 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 +ADD rpmmacros /home/trinity/.rpmmacros diff --git a/redhat/docker/f26/Dockerfile b/redhat/docker/f26/Dockerfile.x86_64 index 3899d1220..3899d1220 100644 --- a/redhat/docker/f26/Dockerfile +++ b/redhat/docker/f26/Dockerfile.x86_64 diff --git a/redhat/docker/f26/packages b/redhat/docker/f26/packages index e7a74d19f..28da2c8db 100644 --- a/redhat/docker/f26/packages +++ b/redhat/docker/f26/packages @@ -197,6 +197,7 @@ t1utils taglib-devel tar texinfo +torsocks transfig udisks-devel unixODBC-devel |