Browse Source

Update images with PHP 7.4 and tideways 5.0.2

Viacheslav Poturaev 6 years ago
parent
commit
cef572d706
5 changed files with 44 additions and 11 deletions
  1. 3 3
      Dockerfile.tideways_v5_php72
  2. 3 3
      Dockerfile.tideways_v5_php73
  3. 26 0
      Dockerfile.tideways_v5_php74
  4. 7 1
      Makefile
  5. 5 4
      README.md

+ 3 - 3
Dockerfile.tideways_v5_php72

@@ -2,15 +2,15 @@ FROM php:7.2-cli
 
 RUN apt-get update && apt-get install -y graphviz && apt-get clean
 
-RUN curl "https://github.com/tideways/php-xhprof-extension/archive/v5.0-beta3.tar.gz" -fsL -o ./a.tar.gz  && \
+RUN curl "https://github.com/tideways/php-xhprof-extension/archive/v5.0.2.tar.gz" -fsL -o ./a.tar.gz  && \
      tar xf ./a.tar.gz && \
-     ls -la && cd ./php-xhprof-extension-5.0-beta3 && \
+     ls -la && cd ./php-xhprof-extension-5.0.2 && \
      ls -la && \
      phpize && \
      ./configure && \
      make && \
      make install && \
-     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0-beta3 && \
+     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0.2 && \
      docker-php-ext-enable tideways_xhprof
 
 COPY ./prepend_v5.php /prepend.php

+ 3 - 3
Dockerfile.tideways_v5_php73

@@ -2,15 +2,15 @@ FROM php:7.3-cli
 
 RUN apt-get update && apt-get install -y graphviz && apt-get clean
 
-RUN curl "https://github.com/tideways/php-xhprof-extension/archive/v5.0-beta3.tar.gz" -fsL -o ./a.tar.gz  && \
+RUN curl "https://github.com/tideways/php-xhprof-extension/archive/v5.0.2.tar.gz" -fsL -o ./a.tar.gz  && \
      tar xf ./a.tar.gz && \
-     ls -la && cd ./php-xhprof-extension-5.0-beta3 && \
+     ls -la && cd ./php-xhprof-extension-5.0.2 && \
      ls -la && \
      phpize && \
      ./configure && \
      make && \
      make install && \
-     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0-beta3 && \
+     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0.2 && \
      docker-php-ext-enable tideways_xhprof
 
 COPY ./prepend_v5.php /prepend.php

+ 26 - 0
Dockerfile.tideways_v5_php74

@@ -0,0 +1,26 @@
+FROM php:7.4-cli
+
+RUN apt-get update && apt-get install -y graphviz && apt-get clean
+
+RUN curl "https://github.com/tideways/php-xhprof-extension/archive/v5.0.2.tar.gz" -fsL -o ./a.tar.gz  && \
+     tar xf ./a.tar.gz && \
+     ls -la && cd ./php-xhprof-extension-5.0.2 && \
+     ls -la && \
+     phpize && \
+     ./configure && \
+     make && \
+     make install && \
+     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0.2 && \
+     docker-php-ext-enable tideways_xhprof
+
+COPY ./prepend_v5.php /prepend.php
+
+COPY ./php.ini /usr/local/etc/php/
+
+COPY ./xhprof/xhprof_lib/utils /utils
+
+ENV SVG=$SVG
+
+ENV REPORT=$REPORT
+
+WORKDIR /code

+ 7 - 1
Makefile

@@ -1,5 +1,5 @@
 build:
-	docker build -t phperf/php-profiler -f Dockerfile.tideways_v4_php73 .
+	docker build -t phperf/php-profiler -f Dockerfile.tideways_v5_php74 .
 
 push:
 	docker push phperf/php-profiler:latest
@@ -28,6 +28,12 @@ build-v5-73:
 push-v5-73:
 	docker push phperf/php-profiler:7.3-tideways-v5
 
+build-v5-74:
+	docker build -t phperf/php-profiler:7.4-tideways-v5 -f Dockerfile.tideways_v5_php74 .
+
+push-v5-74:
+	docker push phperf/php-profiler:7.4-tideways-v5
+
 build-xhprof:
 	docker build -t phperf/php-profiler:5.6-xhprof -f Dockerfile.xhprof_php56 .
 

+ 5 - 4
README.md

@@ -4,7 +4,7 @@
 [![Docker Pulls](https://img.shields.io/docker/pulls/phperf/php-profiler.svg)](https://hub.docker.com/r/phperf/php-profiler)
 [![Image Size](https://images.microbadger.com/badges/image/phperf/php-profiler.svg)](https://microbadger.com/images/phperf/php-profiler)
 
-Portable docker image with PHP 7.3 and `tideways` extension installed.
+Portable docker image with PHP 7.4 and `tideways` extension installed.
 
 Profiling is started automatically with `auto_prepend_file` configuration.
 
@@ -73,10 +73,11 @@ Saving report to rep.json
 
 ## Tags
 
-* `phperf/php-profiler:latest` PHP 7.3, tideways 4.1.7, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v4_php73)
+* `phperf/php-profiler:latest` PHP 7.3, tideways 5.0.2, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v5_php74)
+* `phperf/php-profiler:7.4-tideways-v5` PHP 7.4, tideways 5.0.2, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v5_php74)
 * `phperf/php-profiler:7.3-tideways-v4` PHP 7.3, tideways 4.1.7, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v4_php73)
-* `phperf/php-profiler:7.3-tideways-v5` PHP 7.3, tideways 5.0-beta3, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v5_php73)
+* `phperf/php-profiler:7.3-tideways-v5` PHP 7.3, tideways 5.0.2, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v5_php73)
 * `phperf/php-profiler:7.2-tideways-v4` PHP 7.2, tideways 4.1.7, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v4_php72)
-* `phperf/php-profiler:7.2-tideways-v5` PHP 7.2, tideways 5.0-beta3, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v5_php72)
+* `phperf/php-profiler:7.2-tideways-v5` PHP 7.2, tideways 5.0.2, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.tideways_v5_php72)
 * `phperf/php-profiler:5.6-xhprof` PHP 5.6, xhprof 0.9.4, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.xhprof_php56)
 * `phperf/php-profiler:5.6-uprofiler` PHP 5.6, uprofiler, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.uprofiler_php56)