create a valgrind.include, and include it in php and php7 docker images

pull/17728/head
Jerry 6 years ago
parent 4351ca35ee
commit b273ffb609
  1. 1
      templates/tools/dockerfile/test/php7_jessie_x64/Dockerfile.template
  2. 1
      templates/tools/dockerfile/test/php_jessie_x64/Dockerfile.template
  3. 8
      templates/tools/dockerfile/valgrind.include
  4. 8
      tools/dockerfile/test/php7_jessie_x64/Dockerfile
  5. 8
      tools/dockerfile/test/php_jessie_x64/Dockerfile

@ -19,6 +19,7 @@
<%include file="../../php7_deps.include"/> <%include file="../../php7_deps.include"/>
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
<%include file="../../python_deps.include"/> <%include file="../../python_deps.include"/>
<%include file="../../valgrind.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -20,6 +20,7 @@
<%include file="../../gcp_api_libraries.include"/> <%include file="../../gcp_api_libraries.include"/>
<%include file="../../python_deps.include"/> <%include file="../../python_deps.include"/>
<%include file="../../php_deps.include"/> <%include file="../../php_deps.include"/>
<%include file="../../valgrind.include"/>
<%include file="../../run_tests_addons.include"/> <%include file="../../run_tests_addons.include"/>
# Define the default command. # Define the default command.
CMD ["bash"] CMD ["bash"]

@ -0,0 +1,8 @@
#=================
# PHP dependencies
# Install dependencies
RUN apt-get update && apt-get install -y ${'\\'}
valgrind

@ -79,6 +79,14 @@ RUN pip install --upgrade pip==10.0.1
RUN pip install virtualenv RUN pip install virtualenv
RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0 RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 twisted==17.5.0
#=================
# PHP dependencies
# Install dependencies
RUN apt-get update && apt-get install -y \
valgrind
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins

@ -76,6 +76,14 @@ RUN pip install futures==2.2.0 enum34==1.0.4 protobuf==3.5.2.post1 six==1.10.0 t
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
git php5 php5-dev phpunit unzip git php5 php5-dev phpunit unzip
#=================
# PHP dependencies
# Install dependencies
RUN apt-get update && apt-get install -y \
valgrind
RUN mkdir /var/local/jenkins RUN mkdir /var/local/jenkins

Loading…
Cancel
Save