summaryrefslogtreecommitdiffstats
path: root/redhat/docker/el6/Dockerfile.x86_64
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2020-10-11 22:55:54 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2020-10-11 22:56:18 +0200
commit07c298ecad0eb6d37d8914bff91f40328b20a9cd (patch)
tree5b65116ec7ce9d393a45ddbd6d9583f3c73ac18d /redhat/docker/el6/Dockerfile.x86_64
parent8e1c5fc5b8ba0eceb6dcf671f6b5b8acd44a1c43 (diff)
downloadtde-packaging-07c298ecad0eb6d37d8914bff91f40328b20a9cd.tar.gz
tde-packaging-07c298ecad0eb6d37d8914bff91f40328b20a9cd.zip
RPM: updates for future 14.0.9 release
Diffstat (limited to 'redhat/docker/el6/Dockerfile.x86_64')
-rw-r--r--redhat/docker/el6/Dockerfile.x86_6417
1 files changed, 7 insertions, 10 deletions
diff --git a/redhat/docker/el6/Dockerfile.x86_64 b/redhat/docker/el6/Dockerfile.x86_64
index c133b4122..3836529c2 100644
--- a/redhat/docker/el6/Dockerfile.x86_64
+++ b/redhat/docker/el6/Dockerfile.x86_64
@@ -4,23 +4,20 @@ ARG TDE_VERSION=14.0.8
ARG ARCH=x86_64
# 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 \
+COPY packages /packages
+RUN echo "proxy=http://proxy:3128" >>"/etc/yum.conf" \
+ && yum -y clean all \
&& yum -y update \
+ && yum -y install epel-release \
+ && rpm -Uvh https://download1.rpmfusion.org/free/el/rpmfusion-free-release-6.noarch.rpm \
&& 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,7 +31,7 @@ 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