You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2019/08/20 13:46:06 UTC

[mesos] 03/03: Updated CentOS 6 dockerfile to properly install devtoolset-7.

This is an automated email from the ASF dual-hosted git repository.

bennoe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git

commit d42ae097e3891670e8f65a0827b33c8444febdf6
Author: Benno Evers <be...@mesosphere.com>
AuthorDate: Tue Aug 20 14:33:27 2019 +0200

    Updated CentOS 6 dockerfile to properly install devtoolset-7.
    
    The previously used yum command was not able to properly install
    the required `devtoolset-7` package since the containing repository
    was only visible after the first `yum` invocation finished.
    
    This would result in `yum` silently ignoring the package, producing
    a broken CentOS 6 docker image.
    
    Review: https://reviews.apache.org/r/71329
---
 support/packaging/centos/centos6.dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/support/packaging/centos/centos6.dockerfile b/support/packaging/centos/centos6.dockerfile
index bb8d591..3151ba9 100644
--- a/support/packaging/centos/centos6.dockerfile
+++ b/support/packaging/centos/centos6.dockerfile
@@ -1,7 +1,6 @@
 FROM centos:6
 MAINTAINER Kapil Arya <ka...@apache.org>
 
-# Get curl.
 RUN yum install -y              \
       centos-release-scl        \
       epel-release              \
@@ -9,8 +8,12 @@ RUN yum install -y              \
       redhat-rpm-config         \
       rpm-build                 \
       scl-utils                 \
-      yum-utils                 \
-      devtoolset-7
+      yum-utils
+
+# We need to install `devtoolset-7` in a separate step because the
+# repository containing it only gets added during installation of
+# the `centos-release-scl` package.
+RUN yum install -y devtoolset-7
 
 # Add the Subversion repo.
 RUN echo -e '[WANdiscoSVN]\n\