summaryrefslogtreecommitdiffstats
path: root/redhat/docker/el6/Dockerfile.i686
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2021-01-30 23:53:31 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2021-01-30 23:57:34 +0100
commiteffbf509eea4f37a1a8660242769ed1746b67ee0 (patch)
tree47f019bebdc7f0549e43e57ac57856b2d505468b /redhat/docker/el6/Dockerfile.i686
parent6581dc50b83f203d65eac61c00a159ab2a6ddb5d (diff)
downloadtde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.tar.gz
tde-packaging-effbf509eea4f37a1a8660242769ed1746b67ee0.zip
RPM: update build scripts for Fedora 33 / CentOS 8
Diffstat (limited to 'redhat/docker/el6/Dockerfile.i686')
-rw-r--r--redhat/docker/el6/Dockerfile.i68626
1 files changed, 11 insertions, 15 deletions
diff --git a/redhat/docker/el6/Dockerfile.i686 b/redhat/docker/el6/Dockerfile.i686
index 8844adabc..c2f90aa35 100644
--- a/redhat/docker/el6/Dockerfile.i686
+++ b/redhat/docker/el6/Dockerfile.i686
@@ -1,26 +1,23 @@
FROM centos32:6
-ARG TDE_VERSION=14.0.8
+ARG TDE_VERSION=14.1.0
ARG ARCH=i686
# Enable proxy
-RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf"
-
# Add EPEL repository
# Add RPMFUSION repository
-RUN rpm -Uvh \
- https://fr2.rpmfind.net/linux/epel/6/x86_64/Packages/e/epel-release-6-8.noarch.rpm \
- https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm
-
# Install Trinity build dependencies
-ADD packages /packages
-RUN yum -y clean all \
- && setarch ${ARCH} yum -y update \
- && setarch ${ARCH} yum -y install $(</packages)
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y clean all \
+ && setarch i686 yum -y update \
+ && setarch i686 yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
+ && setarch i686 yum -y install $(</packages)
# Add YUM repository for locally built packages
WORKDIR /etc/yum.repos.d
-ADD rpmbuild.repo rpmbuild.repo
+COPY rpmbuild.repo rpmbuild.repo
RUN sed -i "rpmbuild.repo" -e "s|\${ARCH}|${ARCH}|g" -e "s|\${TDE_VERSION}|${TDE_VERSION}|g"
# Fix utempter detection
@@ -34,12 +31,11 @@ RUN useradd -m -s /bin/bash -u 1000 trinity \
&& echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers"
USER trinity
-ADD rpmmacros /home/trinity/.rpmmacros
+COPY rpmmacros /home/trinity/.rpmmacros
# Build supplementary development tools
-RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/m4-1.4.16-10.el7.src.rpm \
- && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/m4-1*.rpm
+RUN sudo rpm -Uvh http://repo/trinity/el6/tools/RPMS/i686/m4-1.4.16-10.el6.i686.rpm
RUN setarch i686 rpmbuild --rebuild http://vault.centos.org/7.7.1908/os/Source/SPackages/autoconf-2.69-11.el7.src.rpm --nodeps \
&& sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/autoconf-2*.rpm