Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed indent issue and yum update

Browse Source
pull/22732/head
jeffreyqw 5 years ago
parent 490bdc45e0
commit 5d539cc15c
2 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/php/docker/centos7/Dockerfile
  2. 8
      templates/src/php/docker/centos7/Dockerfile.template

8
src/php/docker/centos7/Dockerfile
Unescape View File

@ -14,13 +14,13 @@
FROM centos:centos7 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* yum install -y devtoolset-7-gcc*
SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"] SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"]
RUN yum update -y && \ RUN yum install epel-release -y && \
yum install epel-release -y && \
rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && \ rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && \
rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && \ rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && \
yum --enablerepo=remi-php72 install php -y && \ yum --enablerepo=remi-php72 install php -y && \
@ -28,7 +28,7 @@ RUN yum update -y && \
yum install -y make wget which \ yum install -y make wget which \
gmp-devel libmpc-devel mpfr-devel yum-utils \ gmp-devel libmpc-devel mpfr-devel yum-utils \
php-devel php-fpm php-pear && \ php-devel php-fpm php-pear && \
yum clean all -y yum clean all -y
ARG MAKEFLAGS=-j8 ARG MAKEFLAGS=-j8

8
templates/src/php/docker/centos7/Dockerfile.template
Unescape View File

@ -16,13 +16,13 @@
FROM centos:centos7 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* yum install -y devtoolset-7-gcc*
SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"] SHELL [ "/usr/bin/scl", "enable", "devtoolset-7"]
RUN yum update -y && ${'\\'} RUN yum install epel-release -y && ${'\\'}
yum install epel-release -y && ${'\\'}
rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && ${'\\'} rpm -Uvh https://mirror.webtatic.com/yum/el7/webtatic-release.rpm && ${'\\'}
rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && ${'\\'} rpm -Uvh http://rpms.famillecollet.com/enterprise/remi-release-7.rpm && ${'\\'}
yum --enablerepo=remi-php72 install php -y && ${'\\'} yum --enablerepo=remi-php72 install php -y && ${'\\'}
@ -30,7 +30,7 @@
yum install -y make wget which ${'\\'} yum install -y make wget which ${'\\'}
gmp-devel libmpc-devel mpfr-devel yum-utils ${'\\'} gmp-devel libmpc-devel mpfr-devel yum-utils ${'\\'}
php-devel php-fpm php-pear && ${'\\'} php-devel php-fpm php-pear && ${'\\'}
yum clean all -y yum clean all -y
ARG MAKEFLAGS=-j8 ARG MAKEFLAGS=-j8

Write Preview
Loading…
Cancel
Save