Merge pull request #24 from devilbox/release-0.16

Add PhotonCMS binary
Disable photon in PHP 5.3/5.4
2025-12-13 12:31:14 +00:00 · 2018-05-16 08:29:58 +02:00 · 2018-05-15 13:23:24 +02:00 · 2018-05-15 10:30:39 +02:00 · 2018-05-15 09:03:28 +02:00 · 2018-05-15 00:27:51 +02:00
10 changed files with 126 additions and 5 deletions
--- a/Dockerfiles/mods/Dockerfile-7.2
+++ b/Dockerfiles/mods/Dockerfile-7.2
@@ -236,6 +236,7 @@ RUN set -x \
 	&& /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \
+	&& /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \
 	\
 	\
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/Dockerfiles/mods/Dockerfile-7.3
@@ -68,6 +68,8 @@ ENV BUILD_DEPS \
 	libsodium-dev \
 	libnghttp2-dev \
 	libssl-dev \
+	libhiredis-dev \
+	cmake \
 	libtidy-dev \
 	libxml2-dev \
 	libxml2-dev \
@@ -101,6 +103,7 @@ ENV RUN_DEPS \
 	librecode0 \
 	snmp \
 	libnghttp2-14 \
+	libhiredis0.13 \
 	libtidy5 \
 	libxslt1.1 \
 	libzip4 \
@@ -157,7 +160,7 @@ RUN set -x \
 	&& git clone -v https://github.com/php-memcached-dev/php-memcached /tmp/memcached \
 	&& cd /tmp/memcached \
 	&& git checkout master \
-	&& phpize && ./configure --enable-memcached && make && make install \
+	&& phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install \
 	&& docker-php-ext-enable memcached \
 	&& cd / && rm -rf /tmp/memcached \
 	&& pecl install mongodb \
@@ -192,8 +195,44 @@ RUN set -x \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) soap \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sockets \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sodium \
-	&& pecl install swoole \
+	&& git clone -v https://github.com/swoole/swoole-src /tmp/swoole \
+	&& cd /tmp/swoole \
+	&& git checkout master \
+	&& git submodule update --init --recursive \
+&& cd thirdparty/hiredis \
+&& make -j$(getconf _NPROCESSORS_ONLN) \
+&& make install \
+&& cd ../nghttp2 \
+&& cmake . \
+&& make install \
+&& ldconfig \
+&& cd ../.. \
+&& phpize \
+&& ./configure \
+  --enable-async-redis \
+  --enable-openssl \
+  --enable-thread \
+  --enable-swoole \
+  --enable-swoole-static \
+  --with-swoole \
+  --with-openssl-dir=/usr \
+  --enable-mysqlnd \
+  --enable-coroutine \
+  --enable-picohttpparser \
+  --enable-timewheel \
+  #`--enable-hugepage` \
+  #`--enable-asan` \
+  #`--with-phpx-dir=` \
+  #`--with-jemalloc-dir=/usr/include/jemalloc` \
+  #`--enable-coroutine-postgresql` \
+  #`--enable-http2` \
+  #`--enable-sockets` \
+  #`--with-libpq-dir=/usr/include/postgresql/libpq/` \
+&& make -j$(getconf _NPROCESSORS_ONLN) \
+&& make install \
+ \
 	&& docker-php-ext-enable swoole \
+	&& cd / && rm -rf /tmp/swoole \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvsem \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvshm \
@@ -216,6 +255,7 @@ RUN set -x \
 	&& /usr/local/bin/docker-php-ext-configure xmlwriter --with-libxml-dir=/usr \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xmlwriter \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) xsl \
+	&& /usr/local/bin/docker-php-ext-configure zip --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip \
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) zip \
 	\
 	\
--- a/Dockerfiles/work/Dockerfile-5.5
+++ b/Dockerfiles/work/Dockerfile-5.5
@@ -200,6 +200,10 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
 \
+# photon
+	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
+&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
+ \
 # sass
 	&& gem install sass \
 # symfony
@@ -286,6 +290,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& photon --version | grep -E 'Installer [.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/Dockerfiles/work/Dockerfile-5.6
@@ -200,6 +200,10 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
 \
+# photon
+	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
+&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
+ \
 # sass
 	&& gem install sass \
 # symfony
@@ -286,6 +290,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& photon --version | grep -E 'Installer [.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/Dockerfiles/work/Dockerfile-7.0
@@ -200,6 +200,10 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
 \
+# photon
+	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
+&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
+ \
 # sass
 	&& gem install sass \
 # symfony
@@ -286,6 +290,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& photon --version | grep -E 'Installer [.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/Dockerfiles/work/Dockerfile-7.1
@@ -200,6 +200,10 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
 \
+# photon
+	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
+&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
+ \
 # sass
 	&& gem install sass \
 # symfony
@@ -286,6 +290,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& photon --version | grep -E 'Installer [.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/Dockerfiles/work/Dockerfile-7.2
@@ -200,6 +200,10 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
 \
+# photon
+	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
+&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
+ \
 # sass
 	&& gem install sass \
 # symfony
@@ -286,6 +290,7 @@ RUN set -x \
 	&& phalcon commands | grep -E '[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& photon --version | grep -E 'Installer [.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/Dockerfiles/work/Dockerfile-7.3
@@ -189,6 +189,10 @@ RUN set -x \
 	&& curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
 && chmod +x /usr/local/bin/phpcbf \
 \
+# photon
+	&& COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
+&& ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
+ \
 # sass
 	&& gem install sass \
 # symfony
@@ -274,6 +278,7 @@ RUN set -x \
 	&& mysqldump-secure --version | grep -E 'Version:\s*[.0-9]+' \
 	&& phpcs --version | grep -E 'version [.0-9]+' \
 	&& phpcbf --version | grep -E 'version [.0-9]+' \
+	&& photon --version | grep -E 'Installer [.0-9]+' \
 	&& sass --version | grep -E '[.0-9]+' \
 	&& symfony --version | grep -E 'version\s*[.0-9]+' \
 	&& webpack --version | grep -E '[.0-9]+' \
--- a/README.md
+++ b/README.md
@@ -830,6 +830,10 @@ You want to use tools such as `git`, `drush`, `composer`, `npm`, `eslint`, `phpc
   <td><a href="https://github.com/squizlabs/PHP_CodeSniffer">phpcbf</a></td>
   <td>PHP Code Beautifier and Fixer.</td>
  </tr>
+  <tr>
+   <td><a href="https://photoncms.com/resources/installing">photon</a></td>
+   <td>Photon CMS cli.</td>
+  </tr>
  <tr>
   <td><a href="http://sass-lang.com/">sass</a></td>
   <td>Sass CSS compiler.</td>
--- a/build/ansible/group_vars/all.yml
+++ b/build/ansible/group_vars/all.yml
@@ -65,6 +65,7 @@ software_enabled:
  - phalcon
  - phpcs
  - phpcbf
+  - photon
  - sass
  - symfony
  - webpack
@@ -333,6 +334,13 @@ software_available:
      command: |
        curl -q https://squizlabs.github.io/PHP_CodeSniffer/phpcbf.phar > /usr/local/bin/phpcbf 2>/dev/null \
        && chmod +x /usr/local/bin/phpcbf \
+  photon:
+    check: photon --version | grep -E 'Installer [.0-9]+'
+    disabled: [5.3, 5.4]
+    all:
+      command: |
+        COMPOSER_HOME="/usr/local/src/composer" composer global require "photoncms/installer" \
+        && ln -s /usr/local/src/composer/vendor/photoncms/installer/photon /usr/local/bin/photon \
  sass:
    check: sass --version | grep -E '[.0-9]+'
    all:
@@ -718,7 +726,7 @@ extensions_available:
      type: git
      git_url: https://github.com/php-memcached-dev/php-memcached
      git_ref: master
-      command: phpize && ./configure --enable-memcached && make && make install
+      command: phpize && ./configure --enable-memcached && make -j$(getconf _NPROCESSORS_ONLN) && make install
    all:
      type: pecl
      build_dep: [zlib1g-dev, libmemcached-dev]
@@ -930,8 +938,44 @@ extensions_available:
      type: pecl
      run_dep: [libnghttp2-14]
    7.3:
-      type: pecl
-      run_dep: [libnghttp2-14]
+      type: git
+      git_url: https://github.com/swoole/swoole-src
+      git_ref: master
+      command: |
+        git submodule update --init --recursive \
+        && cd thirdparty/hiredis \
+        && make -j$(getconf _NPROCESSORS_ONLN) \
+        && make install \
+        && cd ../nghttp2 \
+        && cmake . \
+        && make install \
+        && ldconfig \
+        && cd ../.. \
+        && phpize \
+        && ./configure \
+          --enable-async-redis \
+          --enable-openssl \
+          --enable-thread \
+          --enable-swoole \
+          --enable-swoole-static \
+          --with-swoole \
+          --with-openssl-dir=/usr \
+          --enable-mysqlnd \
+          --enable-coroutine \
+          --enable-picohttpparser \
+          --enable-timewheel \
+          #`--enable-hugepage` \
+          #`--enable-asan` \
+          #`--with-phpx-dir=` \
+          #`--with-jemalloc-dir=/usr/include/jemalloc` \
+          #`--enable-coroutine-postgresql` \
+          #`--enable-http2` \
+          #`--enable-sockets` \
+          #`--with-libpq-dir=/usr/include/postgresql/libpq/` \
+        && make -j$(getconf _NPROCESSORS_ONLN) \
+        && make install \
+      run_dep: [libnghttp2-14, libhiredis0.13]
+      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake]
    all:
      type: pecl
      build_dep: [libnghttp2-dev, libssl-dev]
@@ -1043,9 +1087,11 @@ extensions_available:
      run_dep: []
    7.2:
      type: builtin
+      configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip
      run_dep: [libzip4]
    7.3:
      type: builtin
+      configure: --with-zlib-dir=/usr --with-pcre-dir=/usr --with-libzip
      run_dep: [libzip4]
    all:
      type: builtin
Author	SHA1	Message	Date
cytopia	920d656cc1	Merge pull request #24 from devilbox/release-0.16 Add PhotonCMS binary	2018-05-16 08:29:58 +02:00
cytopia	41581bf9a3	Disable photon in PHP 5.3/5.4	2018-05-15 13:23:24 +02:00
cytopia	aab7599eab	Use latest photon version without fixing	2018-05-15 10:30:39 +02:00
cytopia	16c113d404	Fix photon version check	2018-05-15 09:03:28 +02:00
cytopia	7c498fd369	Fix photon cli installation	2018-05-15 00:27:51 +02:00
cytopia	9ee2da9fa3	Add photon binary	2018-05-14 21:34:31 +02:00
cytopia	1df74274a1	Merge pull request #23 from devilbox/release-0.15 Fix PHP 7.3	2018-05-14 21:29:23 +02:00
cytopia	182eda1f05	Fix PHP 7.3	2018-05-14 20:15:46 +02:00