From 490bdc45e04a6df6e510943522b4339e67e03f86 Mon Sep 17 00:00:00 2001 From: jeffreyqw <49655798+jeffreyqw@users.noreply.github.com> Date: Wed, 22 Apr 2020 01:08:33 -0700 Subject: [PATCH 1/2] update devtoolset gcc version Centos7 removed devtooset-4,5 and 6 version. --- src/php/docker/README.md | 6 +++--- src/php/docker/centos7/Dockerfile | 18 ++++++++++-------- .../src/php/docker/centos7/Dockerfile.template | 18 ++++++++++-------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/php/docker/README.md b/src/php/docker/README.md index 3df7039b8ce..638d65cbb84 100644 --- a/src/php/docker/README.md +++ b/src/php/docker/README.md @@ -97,17 +97,17 @@ $ docker run -it --rm grpc-php/alpine ``` ### `centos7` -This image builds the `grpc` extension against the GCC version in Centos7 base image. +This image builds the `grpc` extension against the GCC version in Centos7 base image. The default version of gcc in centos7 is gcc-4.8.5. Run `scl enable devtoolset-7 bash` command to enable gcc-7.3.1. Build `centos7` docker image: ```sh $ cd grpc -$ docker build -t grpc-gcc5/centos -f ./src/php/docker/centos7/Dockerfile . +$ docker build -t grpc-gcc7/centos -f ./src/php/docker/centos7/Dockerfile . ``` Run image: ```sh -$ docker run -it --rm grpc-gcc5/centos +$ docker run -it --rm grpc-gcc7/centos ``` ### `php-src` diff --git a/src/php/docker/centos7/Dockerfile b/src/php/docker/centos7/Dockerfile index 7c96c77f7f5..9ccdf759297 100644 --- a/src/php/docker/centos7/Dockerfile +++ b/src/php/docker/centos7/Dockerfile @@ -14,25 +14,27 @@ FROM centos:centos7 +RUN yum install -y centos-release-scl && \ + yum install -y devtoolset-7-gcc* + +SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"] + RUN yum update -y && \ yum install epel-release -y && \ rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && \ rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && \ yum --enablerepo=remi-php72 install php -y && \ - yum-config-manager --enable remi-php72 && \ - yum install -y php-fpm php-pear make php-devel wget libmpc-devel mpfr-devel gmp-devel yum-utils && \ - yum clean all -y + yum-config-manager --enable remi-php72 > /dev/null && \ + yum install -y make wget which \ + gmp-devel libmpc-devel mpfr-devel yum-utils \ + php-devel php-fpm php-pear && \ + yum clean all -y ARG MAKEFLAGS=-j8 WORKDIR /tmp -RUN yum install -y centos-release-scl && \ - yum install -y devtoolset-4-gcc* - -SHELL [ "/usr/bin/scl", "enable", "devtoolset-4"] - RUN wget https://phar.phpunit.de/phpunit-5.7.27.phar && \ mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \ chmod +x /usr/local/bin/phpunit diff --git a/templates/src/php/docker/centos7/Dockerfile.template b/templates/src/php/docker/centos7/Dockerfile.template index 61fa7907edc..368c6ee506e 100644 --- a/templates/src/php/docker/centos7/Dockerfile.template +++ b/templates/src/php/docker/centos7/Dockerfile.template @@ -16,25 +16,27 @@ FROM centos:centos7 + RUN yum install -y centos-release-scl && ${'\\'} + yum install -y devtoolset-7-gcc* + + SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"] + RUN yum update -y && ${'\\'} yum install epel-release -y && ${'\\'} rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && ${'\\'} rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && ${'\\'} yum --enablerepo=remi-php72 install php -y && ${'\\'} - yum-config-manager --enable remi-php72 && ${'\\'} - yum install -y php-fpm php-pear make php-devel wget libmpc-devel mpfr-devel gmp-devel yum-utils && ${'\\'} - yum clean all -y + yum-config-manager --enable remi-php72 > /dev/null && ${'\\'} + yum install -y make wget which ${'\\'} + gmp-devel libmpc-devel mpfr-devel yum-utils ${'\\'} + php-devel php-fpm php-pear && ${'\\'} + yum clean all -y ARG MAKEFLAGS=-j8 WORKDIR /tmp - RUN yum install -y centos-release-scl && ${'\\'} - yum install -y devtoolset-4-gcc* - - SHELL [ "/usr/bin/scl", "enable", "devtoolset-4"] - <%include file="../download_phpunit.include" /> <%include file="../pecl_ext_build_src.include" /> From 5d539cc15c3309503877867cf4dca7bb1a191a5b Mon Sep 17 00:00:00 2001 From: jeffreyqw <49655798+jeffreyqw@users.noreply.github.com> Date: Wed, 22 Apr 2020 10:10:10 -0700 Subject: [PATCH 2/2] fixed indent issue and yum update --- src/php/docker/centos7/Dockerfile | 8 ++++---- templates/src/php/docker/centos7/Dockerfile.template | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/php/docker/centos7/Dockerfile b/src/php/docker/centos7/Dockerfile index 9ccdf759297..e6df3ef819e 100644 --- a/src/php/docker/centos7/Dockerfile +++ b/src/php/docker/centos7/Dockerfile @@ -14,13 +14,13 @@ FROM centos:centos7 -RUN yum install -y centos-release-scl && \ +RUN yum update -y && \ + yum install -y centos-release-scl && \ yum install -y devtoolset-7-gcc* SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"] -RUN yum update -y && \ - yum install epel-release -y && \ +RUN yum install epel-release -y && \ rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && \ rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && \ yum --enablerepo=remi-php72 install php -y && \ @@ -28,7 +28,7 @@ RUN yum update -y && \ yum install -y make wget which \ gmp-devel libmpc-devel mpfr-devel yum-utils \ php-devel php-fpm php-pear && \ - yum clean all -y + yum clean all -y ARG MAKEFLAGS=-j8 diff --git a/templates/src/php/docker/centos7/Dockerfile.template b/templates/src/php/docker/centos7/Dockerfile.template index 368c6ee506e..47084bfddc2 100644 --- a/templates/src/php/docker/centos7/Dockerfile.template +++ b/templates/src/php/docker/centos7/Dockerfile.template @@ -16,13 +16,13 @@ FROM centos:centos7 - RUN yum install -y centos-release-scl && ${'\\'} + RUN yum update -y && ${'\\'} + yum install -y centos-release-scl && ${'\\'} yum install -y devtoolset-7-gcc* SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"] - RUN yum update -y && ${'\\'} - yum install epel-release -y && ${'\\'} + RUN yum install epel-release -y && ${'\\'} rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && ${'\\'} rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && ${'\\'} yum --enablerepo=remi-php72 install php -y && ${'\\'} @@ -30,7 +30,7 @@ yum install -y make wget which ${'\\'} gmp-devel libmpc-devel mpfr-devel yum-utils ${'\\'} php-devel php-fpm php-pear && ${'\\'} - yum clean all -y + yum clean all -y ARG MAKEFLAGS=-j8