Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade PHP7 docker image to use Debian 9 (#27537)

Browse Source 
* Upgrade PHP7 docker image to use Debian 9

* update
pull/27426/head
Esun Kim 3 years ago committed by GitHub
parent d811d178ee
commit 11d2f86e5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 44 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. 2
      templates/tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile.template
  2. 18
      templates/tools/dockerfile/php7_deps.include
  3. 2
      templates/tools/dockerfile/test/php7_debian9_x64/Dockerfile.template
  4. 20
      tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile
  5. 20
      tools/dockerfile/test/php7_debian9_x64/Dockerfile
  6. 2
      tools/run_tests/run_tests.py

2
templates/tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile.template
Unescape View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
<%include file="../../debian_8_header.include"/> <%include file="../../debian_9_header.include"/>
<%include file="../../php7_deps.include"/> <%include file="../../php7_deps.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>

18
templates/tools/dockerfile/php7_deps.include
Unescape View File

@ -9,6 +9,7 @@ RUN apt-get update && apt-get install -y ${'\\'}
ccache ${'\\'} ccache ${'\\'}
curl ${'\\'} curl ${'\\'}
git ${'\\'} git ${'\\'}
libbison-dev ${'\\'}
libcurl4-openssl-dev ${'\\'} libcurl4-openssl-dev ${'\\'}
libgmp-dev ${'\\'} libgmp-dev ${'\\'}
libgmp3-dev ${'\\'} libgmp3-dev ${'\\'}
@ -20,26 +21,17 @@ RUN apt-get update && apt-get install -y ${'\\'}
time ${'\\'} time ${'\\'}
unzip ${'\\'} unzip ${'\\'}
wget ${'\\'} wget ${'\\'}
zip && apt-get clean zip ${'\\'}
zlib1g-dev && apt-get clean
# Install other dependencies
RUN ln -sf /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
RUN wget http://ftp.gnu.org/gnu/bison/bison-3.4.2.tar.gz -O /var/local/bison-3.4.2.tar.gz
RUN cd /var/local ${'\\'}
&& tar -zxvf bison-3.4.2.tar.gz ${'\\'}
&& cd /var/local/bison-3.4.2 ${'\\'}
&& ./configure ${'\\'}
&& make ${'\\'}
&& make install
# Compile PHP7 from source # Compile PHP7 from source
RUN git clone https://github.com/php/php-src /var/local/git/php-src RUN git clone https://github.com/php/php-src /var/local/git/php-src
RUN cd /var/local/git/php-src ${'\\'} RUN cd /var/local/git/php-src ${'\\'}
&& git checkout PHP-7.2.22 ${'\\'} && git checkout PHP-7.2.34 ${'\\'}
&& ./buildconf --force ${'\\'} && ./buildconf --force ${'\\'}
&& ./configure ${'\\'} && ./configure ${'\\'}
--with-gmp ${'\\'} --with-gmp ${'\\'}
--with-openssl ${'\\'} --with-openssl ${'\\'}
--with-zlib ${'\\'} --with-zlib ${'\\'}
&& make ${'\\'} && make -j$(nproc) ${'\\'}
&& make install && make install

2
templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template → templates/tools/dockerfile/test/php7_debian9_x64/Dockerfile.template
Unescape View File

@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
<%include file="../../debian_8_header.include"/> <%include file="../../debian_9_header.include"/>
<%include file="../../php7_deps.include"/> <%include file="../../php7_deps.include"/>
<%include file="../../python_deps.include"/> <%include file="../../python_deps.include"/>

20
tools/dockerfile/interoptest/grpc_interop_php7/Dockerfile
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM debian:8 FROM debian:9
#================= #=================
@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y \
ccache \ ccache \
curl \ curl \
git \ git \
libbison-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libgmp-dev \ libgmp-dev \
libgmp3-dev \ libgmp3-dev \
@ -37,28 +38,19 @@ RUN apt-get update && apt-get install -y \
time \ time \
unzip \ unzip \
wget \ wget \
zip && apt-get clean zip \
zlib1g-dev && apt-get clean
# Install other dependencies
RUN ln -sf /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
RUN wget http://ftp.gnu.org/gnu/bison/bison-3.4.2.tar.gz -O /var/local/bison-3.4.2.tar.gz
RUN cd /var/local \
&& tar -zxvf bison-3.4.2.tar.gz \
&& cd /var/local/bison-3.4.2 \
&& ./configure \
&& make \
&& make install
# Compile PHP7 from source # Compile PHP7 from source
RUN git clone https://github.com/php/php-src /var/local/git/php-src RUN git clone https://github.com/php/php-src /var/local/git/php-src
RUN cd /var/local/git/php-src \ RUN cd /var/local/git/php-src \
&& git checkout PHP-7.2.22 \ && git checkout PHP-7.2.34 \
&& ./buildconf --force \ && ./buildconf --force \
&& ./configure \ && ./configure \
--with-gmp \ --with-gmp \
--with-openssl \ --with-openssl \
--with-zlib \ --with-zlib \
&& make \ && make -j$(nproc) \
&& make install && make install

20
tools/dockerfile/test/php7_jessie_x64/Dockerfile → tools/dockerfile/test/php7_debian9_x64/Dockerfile
Unescape View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM debian:8 FROM debian:9
#================= #=================
@ -26,6 +26,7 @@ RUN apt-get update && apt-get install -y \
ccache \ ccache \
curl \ curl \
git \ git \
libbison-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libgmp-dev \ libgmp-dev \
libgmp3-dev \ libgmp3-dev \
@ -37,28 +38,19 @@ RUN apt-get update && apt-get install -y \
time \ time \
unzip \ unzip \
wget \ wget \
zip && apt-get clean zip \
zlib1g-dev && apt-get clean
# Install other dependencies
RUN ln -sf /usr/include/x86_64-linux-gnu/gmp.h /usr/include/gmp.h
RUN wget http://ftp.gnu.org/gnu/bison/bison-3.4.2.tar.gz -O /var/local/bison-3.4.2.tar.gz
RUN cd /var/local \
&& tar -zxvf bison-3.4.2.tar.gz \
&& cd /var/local/bison-3.4.2 \
&& ./configure \
&& make \
&& make install
# Compile PHP7 from source # Compile PHP7 from source
RUN git clone https://github.com/php/php-src /var/local/git/php-src RUN git clone https://github.com/php/php-src /var/local/git/php-src
RUN cd /var/local/git/php-src \ RUN cd /var/local/git/php-src \
&& git checkout PHP-7.2.22 \ && git checkout PHP-7.2.34 \
&& ./buildconf --force \ && ./buildconf --force \
&& ./configure \ && ./configure \
--with-gmp \ --with-gmp \
--with-openssl \ --with-openssl \
--with-zlib \ --with-zlib \
&& make \ && make -j$(nproc) \
&& make install && make install
#==================== #====================

2
tools/run_tests/run_tests.py
Unescape View File

@ -590,7 +590,7 @@ class Php7Language(object):
return 'Makefile' return 'Makefile'
def dockerfile_dir(self): def dockerfile_dir(self):
return 'tools/dockerfile/test/php7_jessie_%s' % _docker_arch_suffix( return 'tools/dockerfile/test/php7_debian9_%s' % _docker_arch_suffix(
self.args.arch) self.args.arch)
def __str__(self): def __str__(self):

Write Preview
Loading…
Cancel
Save