diff options
Diffstat (limited to 'redhat/docker/f31')
-rw-r--r-- | redhat/docker/f31/Dockerfile.i686 | 26 | ||||
-rw-r--r-- | redhat/docker/f31/Dockerfile.x86_64 | 3 |
2 files changed, 3 insertions, 26 deletions
diff --git a/redhat/docker/f31/Dockerfile.i686 b/redhat/docker/f31/Dockerfile.i686 deleted file mode 100644 index 81d852e50..000000000 --- a/redhat/docker/f31/Dockerfile.i686 +++ /dev/null @@ -1,26 +0,0 @@ -FROM fedora32:31 - -ARG TDE_VERSION=14.0.7 -ARG ARCH=i686 - -RUN echo "proxy=http://proxy:3128" >>"/etc/dnf.conf" - -# Fix DNF database corruption -RUN setarch i686 dnf -y install dnf-plugin-ovl findutils - -# Add RPMFUSION repository -RUN setarch i686 dnf -y --enableplugin=ovl install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-30.noarch.rpm - -# Install Trinity build dependencies -RUN setarch i686 dnf -y --enableplugin=ovl update -ADD packages /packages -RUN setarch i686 dnf -y --enableplugin=ovl install $(</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/f31/Dockerfile.x86_64 b/redhat/docker/f31/Dockerfile.x86_64 index e330e4d9e..62a39e78d 100644 --- a/redhat/docker/f31/Dockerfile.x86_64 +++ b/redhat/docker/f31/Dockerfile.x86_64 @@ -20,6 +20,9 @@ RUN dnf -y --enableplugin=ovl install $(</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" +# Fix utempter detection +RUN chmod a+r /usr/libexec/utempter/utempter + # 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 |