Browse Source

Update to latest versions

Viacheslav Poturaev 7 years ago
parent
commit
430c72c0c2
6 changed files with 83 additions and 17 deletions
  1. 3 3
      Dockerfile
  2. 26 0
      Dockerfile.tideways_v4_php73
  3. 3 3
      Dockerfile.v5
  4. 26 0
      Dockerfile.tideways_v5_php73
  5. 19 7
      Makefile
  6. 6 4
      README.md

+ 3 - 3
Dockerfile

@@ -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/v4.1.5.tar.gz" -fsL -o ./a.tar.gz  && \
+RUN curl "https://github.com/tideways/php-xhprof-extension/archive/v4.1.7.tar.gz" -fsL -o ./a.tar.gz  && \
      tar xf ./a.tar.gz && \
-     ls -la && cd ./php-xhprof-extension-4.1.5 && \
+     ls -la && cd ./php-xhprof-extension-4.1.7 && \
      ls -la && \
      phpize && \
      ./configure && \
      make && \
      make install && \
-     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-4.1.5 && \
+     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-4.1.7 && \
      docker-php-ext-enable tideways
 
 COPY ./prepend_v4.php /prepend.php

+ 26 - 0
Dockerfile.tideways_v4_php73

@@ -0,0 +1,26 @@
+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/v4.1.7.tar.gz" -fsL -o ./a.tar.gz  && \
+     tar xf ./a.tar.gz && \
+     ls -la && cd ./php-xhprof-extension-4.1.7 && \
+     ls -la && \
+     phpize && \
+     ./configure && \
+     make && \
+     make install && \
+     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-4.1.7 && \
+     docker-php-ext-enable tideways
+
+COPY ./prepend_v4.php /prepend.php
+
+COPY ./php.ini /usr/local/etc/php/
+
+COPY ./xhprof/xhprof_lib/utils /utils
+
+ENV SVG=$SVG
+
+ENV REPORT=$REPORT
+
+WORKDIR /code

+ 3 - 3
Dockerfile.v5

@@ -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-beta2.tar.gz" -fsL -o ./a.tar.gz  && \
+RUN curl "https://github.com/tideways/php-xhprof-extension/archive/v5.0-beta3.tar.gz" -fsL -o ./a.tar.gz  && \
      tar xf ./a.tar.gz && \
-     ls -la && cd ./php-xhprof-extension-5.0-beta2 && \
+     ls -la && cd ./php-xhprof-extension-5.0-beta3 && \
      ls -la && \
      phpize && \
      ./configure && \
      make && \
      make install && \
-     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0-beta2 && \
+     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0-beta3 && \
      docker-php-ext-enable tideways_xhprof
 
 COPY ./prepend_v5.php /prepend.php

+ 26 - 0
Dockerfile.tideways_v5_php73

@@ -0,0 +1,26 @@
+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  && \
+     tar xf ./a.tar.gz && \
+     ls -la && cd ./php-xhprof-extension-5.0-beta3 && \
+     ls -la && \
+     phpize && \
+     ./configure && \
+     make && \
+     make install && \
+     cd .. && rm -rf ./a.tar.gz ./php-xhprof-extension-5.0-beta3 && \
+     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

+ 19 - 7
Makefile

@@ -1,21 +1,33 @@
 build:
-	docker build -t phperf/php-profiler .
+	docker build -t phperf/php-profiler -f Dockerfile.tideways_v4_php73 .
 
 push:
 	docker push phperf/php-profiler:latest
 
-build-v4:
-	docker build -t phperf/php-profiler:7.2-tideways-v4 -f Dockerfile .
+build-v4-72:
+	docker build -t phperf/php-profiler:7.2-tideways-v4 -f Dockerfile.tideways_v4_php72 .
 
-push-v4:
+push-v4-72:
 	docker push phperf/php-profiler:7.2-tideways-v4
 
-build-v5:
-	docker build -t phperf/php-profiler:7.2-tideways-v5 -f Dockerfile.v5 .
+build-v5-72:
+	docker build -t phperf/php-profiler:7.2-tideways-v5 -f Dockerfile.tideways_v5_php72 .
 
-push-v5:
+push-v5-72:
 	docker push phperf/php-profiler:7.2-tideways-v5
 
+build-v4-73:
+	docker build -t phperf/php-profiler:7.3-tideways-v4 -f Dockerfile.tideways_v4_php73 .
+
+push-v4-73:
+	docker push phperf/php-profiler:7.3-tideways-v4
+
+build-v5-73:
+	docker build -t phperf/php-profiler:7.3-tideways-v5 -f Dockerfile.tideways_v5_php73 .
+
+push-v5-73:
+	docker push phperf/php-profiler:7.3-tideways-v5
+
 build-xhprof:
 	docker build -t phperf/php-profiler:5.6-xhprof -f Dockerfile.xhprof_php56 .
 

+ 6 - 4
README.md

@@ -1,6 +1,6 @@
 # Dockerized command-line PHP 7 profiler (XHPROF-compatible)
 
-Portable docker image with PHP 7.2 and `tideways` extension installed.
+Portable docker image with PHP 7.3 and `tideways` extension installed.
 
 Profiling is started automatically with `auto_prepend_file` configuration.
 
@@ -69,8 +69,10 @@ Saving report to rep.json
 
 ## Tags
 
-* `phperf/php-profiler:latest` PHP 7.2, tideways 4.1.5, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile)
-* `phperf/php-profiler:7.2-tideways-v4` PHP 7.2, tideways 4.1.5, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile)
-* `phperf/php-profiler:7.2-tideways-v5` PHP 7.2, tideways 5.0-beta2, [Dockerfile](https://github.com/phperf/profiler-docker/blob/master/Dockerfile.v5)
+* `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: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.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: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)