Merge pull request #67 from devilbox/release-0.52

Fix drush9 build for work container

.travis.yml

@@ -98,11 +98,13 @@ script:
   - if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
       echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin &&
       if [ "${TRAVIS_BRANCH}" == "master" ]; then
+        echo "Pushing latest";
         docker push "${IMAGE}:${PHP}-base";
         docker push "${IMAGE}:${PHP}-mods";
         docker push "${IMAGE}:${PHP}-prod";
         docker push "${IMAGE}:${PHP}-work";
       elif [[ ${TRAVIS_BRANCH} =~ ^(release-[.0-9]+)$ ]]; then
+        echo "Pushing branch ${TRAVIS_BRANCH}";
         docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_BRANCH}" &&
         docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}" &&
@@ -112,6 +114,7 @@ script:
         docker push "${IMAGE}:${PHP}-prod-${TRAVIS_BRANCH}";
         docker push "${IMAGE}:${PHP}-work-${TRAVIS_BRANCH}";
       elif [ -n "${TRAVIS_TAG}" ]; then
+        echo "Pushing tag ${TRAVIS_TAG}";
         docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}" &&
         docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}" &&
@@ -120,6 +123,18 @@ script:
         docker push "${IMAGE}:${PHP}-mods-${TRAVIS_TAG}";
         docker push "${IMAGE}:${PHP}-prod-${TRAVIS_TAG}";
         docker push "${IMAGE}:${PHP}-work-${TRAVIS_TAG}";
+      elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ]; then
+        if MY_TAG="$( git describe --exact-match "$(git rev-parse HEAD)" 2>/dev/null )"; then
+          echo "Pushing cron tag ${MY_TAG}";
+          docker tag "${IMAGE}:${PHP}-base" "${IMAGE}:${PHP}-base-${MY_TAG}" &&
+          docker tag "${IMAGE}:${PHP}-mods" "${IMAGE}:${PHP}-mods-${MY_TAG}" &&
+          docker tag "${IMAGE}:${PHP}-prod" "${IMAGE}:${PHP}-prod-${MY_TAG}" &&
+          docker tag "${IMAGE}:${PHP}-work" "${IMAGE}:${PHP}-work-${MY_TAG}" &&
+          docker push "${IMAGE}:${PHP}-base-${MY_TAG}";
+          docker push "${IMAGE}:${PHP}-mods-${MY_TAG}";
+          docker push "${IMAGE}:${PHP}-prod-${MY_TAG}";
+          docker push "${IMAGE}:${PHP}-work-${MY_TAG}";
+        fi
       else
         echo "Skipping push to dockerhub on normal branches";
       fi

Dockerfiles/mods/Dockerfile-5.3

@@ -32,8 +32,10 @@ ENV BUILD_DEPS \
 	libjpeg-dev \
 	libkrb5-dev \
 	libldap2-dev \
+	libmagickwand-dev \
 	libmcrypt-dev \
 	libmemcached-dev \
+	libnghttp2-dev \
 	libpng-dev \
 	libpq-dev \
 	libpspell-dev \
@@ -60,9 +62,11 @@ ENV RUN_DEPS \
 	libfreetype6 \
 	libicu52 \
 	libjpeg62-turbo \
+	libmagickwand-6.q16-2 \
 	libmcrypt4 \
 	libmemcachedutil2 \
 	libmysqlclient18 \
+	libnghttp2-5 \
 	libpng12-0 \
 	libpq5 \
 	librabbitmq1 \
@@ -168,11 +172,17 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/doc/gmp || true) \
 	\
 # ---- Installing PHP Extension: igbinary ----
-	&& pecl install igbinary-2.0.7 \
+	&& pecl install igbinary \
 	&& docker-php-ext-enable igbinary \
 	&& (rm -rf /usr/local/lib/php/test/igbinary || true) \
 	&& (rm -rf /usr/local/lib/php/doc/igbinary || true) \
 	\
+# ---- Installing PHP Extension: imagick ----
+	&& pecl install imagick-3.3.0 \
+	&& docker-php-ext-enable imagick \
+	&& (rm -rf /usr/local/lib/php/test/imagick || true) \
+	&& (rm -rf /usr/local/lib/php/doc/imagick || true) \
+	\
 # ---- Installing PHP Extension: imap ----
 	&& ln -s /usr/lib/x86_64-linux-gnu/libkrb5* /usr/lib/ \
 	&& /usr/local/bin/docker-php-ext-configure imap --with-kerberos --with-imap-ssl --with-imap \
@@ -225,6 +235,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/mongo || true) \
 	&& (rm -rf /usr/local/lib/php/doc/mongo || true) \
 	\
+# ---- Installing PHP Extension: mongodb ----
+	&& pecl install mongodb-0.6.3 \
+	&& docker-php-ext-enable mongodb \
+	&& (rm -rf /usr/local/lib/php/test/mongodb || true) \
+	&& (rm -rf /usr/local/lib/php/doc/mongodb || true) \
+	\
 # ---- Installing PHP Extension: msgpack ----
 	&& pecl install msgpack-0.5.7 \
 	&& docker-php-ext-enable msgpack \
@@ -274,6 +290,15 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/pgsql || true) \
 	&& (rm -rf /usr/local/lib/php/doc/pgsql || true) \
 	\
+# ---- Installing PHP Extension: phalcon ----
+	&& git clone https://github.com/phalcon/cphalcon /tmp/phalcon \
+	&& cd /tmp/phalcon \
+	&& git checkout phalcon-v2.0.9 \
+	&& cd build && ./install >/dev/null \
+	&& docker-php-ext-enable phalcon \
+	&& (rm -rf /usr/local/lib/php/test/phalcon || true) \
+	&& (rm -rf /usr/local/lib/php/doc/phalcon || true) \
+	\
 # ---- Installing PHP Extension: pspell ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) pspell \
 	&& (rm -rf /usr/local/lib/php/test/pspell || true) \
@@ -313,6 +338,12 @@ RUN set -x \
 	&& (rm -rf /usr/local/lib/php/test/sockets || true) \
 	&& (rm -rf /usr/local/lib/php/doc/sockets || true) \
 	\
+# ---- Installing PHP Extension: swoole ----
+	&& pecl install swoole-1.9.23 \
+	&& docker-php-ext-enable swoole \
+	&& (rm -rf /usr/local/lib/php/test/swoole || true) \
+	&& (rm -rf /usr/local/lib/php/doc/swoole || true) \
+	\
 # ---- Installing PHP Extension: sysvmsg ----
 	&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) sysvmsg \
 	&& (rm -rf /usr/local/lib/php/test/sysvmsg || true) \
@@ -443,6 +474,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^iconv$' \
 	&& php -m | grep -oiE '^igbinary$' \
 	&& php-fpm -m | grep -oiE '^igbinary$' \
+	&& php -m | grep -oiE '^imagick$' \
+	&& php-fpm -m | grep -oiE '^imagick$' \
 	&& php -m | grep -oiE '^imap$' \
 	&& php-fpm -m | grep -oiE '^imap$' \
 	&& php -m | grep -oiE '^interbase$' \
@@ -465,6 +498,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^memcached$' \
 	&& php -m | grep -oiE '^mongo$' \
 	&& php-fpm -m | grep -oiE '^mongo$' \
+	&& php -m | grep -oiE '^mongodb$' \
+	&& php-fpm -m | grep -oiE '^mongodb$' \
 	&& php -m | grep -oiE '^msgpack$' \
 	&& php-fpm -m | grep -oiE '^msgpack$' \
 	&& php -m | grep -oiE '^mysql$' \
@@ -495,6 +530,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^pdo_sqlite$' \
 	&& php -m | grep -oiE '^pgsql$' \
 	&& php-fpm -m | grep -oiE '^pgsql$' \
+	&& php -m | grep -oiE '^phalcon$' \
+	&& php-fpm -m | grep -oiE '^phalcon$' \
 	&& php -m | grep -oiE '^phar$' \
 	&& php-fpm -m | grep -oiE '^phar$' \
 	&& php -m | grep -oiE '^posix$' \
@@ -519,6 +556,8 @@ RUN set -x \
 	&& php-fpm -m | grep -oiE '^soap$' \
 	&& php -m | grep -oiE '^sockets$' \
 	&& php-fpm -m | grep -oiE '^sockets$' \
+	&& php -m | grep -oiE '^swoole$' \
+	&& php-fpm -m | grep -oiE '^swoole$' \
 	&& php -m | grep -oiE '^sysvmsg$' \
 	&& php-fpm -m | grep -oiE '^sysvmsg$' \
 	&& php -m | grep -oiE '^sysvsem$' \

Dockerfiles/mods/Dockerfile-7.3

@@ -298,37 +298,13 @@ RUN set -x \
 	&& cd /tmp/swoole \
 	&& git checkout master \
 	&& git checkout $(git describe --abbrev=0 --tags) \
-&& git submodule update --init --recursive \
-#`&& cd thirdparty/hiredis` \
-#`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-#`&& make install` \
-#`&& cd ../../` \
-&& cd thirdparty/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-sockets \
+  --enable-http2 \
   --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/` \
+  --enable-coroutine-postgresql \
 && make -j$(getconf _NPROCESSORS_ONLN) \
 && make install \
  \

Dockerfiles/mods/Dockerfile-7.4

@@ -285,37 +285,13 @@ RUN set -x \
 	&& cd /tmp/swoole \
 	&& git checkout master \
 	&& git checkout $(git describe --abbrev=0 --tags) \
-&& git submodule update --init --recursive \
-#`&& cd thirdparty/hiredis` \
-#`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-#`&& make install` \
-#`&& cd ../../` \
-&& cd thirdparty/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-sockets \
+  --enable-http2 \
   --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/` \
+  --enable-coroutine-postgresql \
 && make -j$(getconf _NPROCESSORS_ONLN) \
 && make install \
  \

Dockerfiles/work/Dockerfile-5.6

@@ -188,7 +188,7 @@ RUN set -x \
 && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
  \
 	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
-&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \
+&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \
 && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
 && rm -rf /usr/local/src/drush9/.git \
 && rm -rf /usr/local/src/drush9/docs \

Dockerfiles/work/Dockerfile-7.0

@@ -188,7 +188,7 @@ RUN set -x \
 && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
  \
 	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
-&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \
+&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \
 && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
 && rm -rf /usr/local/src/drush9/.git \
 && rm -rf /usr/local/src/drush9/docs \

Dockerfiles/work/Dockerfile-7.1

@@ -188,7 +188,7 @@ RUN set -x \
 && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
  \
 	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
-&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \
+&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \
 && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
 && rm -rf /usr/local/src/drush9/.git \
 && rm -rf /usr/local/src/drush9/docs \

Dockerfiles/work/Dockerfile-7.2

@@ -188,7 +188,7 @@ RUN set -x \
 && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
  \
 	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
-&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \
+&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \
 && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
 && rm -rf /usr/local/src/drush9/.git \
 && rm -rf /usr/local/src/drush9/docs \

Dockerfiles/work/Dockerfile-7.3

@@ -188,7 +188,7 @@ RUN set -x \
 && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
  \
 	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
-&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \
+&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \
 && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
 && rm -rf /usr/local/src/drush9/.git \
 && rm -rf /usr/local/src/drush9/docs \

Dockerfiles/work/Dockerfile-7.4

@@ -188,7 +188,7 @@ RUN set -x \
 && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
  \
 	&& chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
-&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \
+&& su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \
 && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
 && rm -rf /usr/local/src/drush9/.git \
 && rm -rf /usr/local/src/drush9/docs \

README.md

@@ -531,7 +531,7 @@ Check out this table to see which Docker image provides what PHP modules.
   <tr>
    <th>5.3</th>
    <td id="53-base">Core, ctype, curl, date, dom, ereg, fileinfo, filter, hash, iconv, json, libxml, mysql, mysqlnd, openssl, pcre, PDO, pdo_sqlite, Phar, posix, readline, recode, Reflection, session, SimpleXML, SPL, SQLite, sqlite3, standard, tokenizer, xml, xmlreader, xmlwriter, zlib</td>
-   <td id="53-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, msgpack, mysql, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
+   <td id="53-mods">amqp, apc, apcu, bcmath, bz2, calendar, Core, ctype, curl, date, dba, dom, enchant, ereg, exif, fileinfo, filter, ftp, gd, gettext, gmp, hash, iconv, igbinary, imagick, imap, interbase, intl, json, ldap, libxml, mbstring, mcrypt, memcache, memcached, mongo, mongodb, msgpack, mysql, mysqli, mysqlnd, openssl, pcntl, pcre, PDO, pdo_dblib, PDO_Firebird, pdo_mysql, pdo_pgsql, pdo_sqlite, pgsql, phalcon, Phar, posix, pspell, rdkafka, readline, recode, redis, Reflection, session, shmop, SimpleXML, snmp, soap, sockets, SPL, SQLite, sqlite3, standard, swoole, sysvmsg, sysvsem, sysvshm, tidy, tokenizer, uploadprogress, wddx, xdebug, xml, xmlreader, xmlrpc, xmlwriter, xsl, Zend OPcache, zip, zlib</td>
   </tr>
   <tr>
    <th>5.4</th>
@@ -766,7 +766,7 @@ Have a look at the following table to see all offered volumes for each Docker im
   </tr>
   <tr>
    <td><code>/etc/php-fpm-custom.d</code></td>
-   <td>Mount this directory into your host computer and add custom PHP-FOM <code>\*.conf</code> files in order to alter PHP-FPM behaviour.</td>
+   <td>Mount this directory into your host computer and add custom PHP-FPM <code>\*.conf</code> files in order to alter PHP-FPM behaviour.</td>
   </tr>
   <tr>
    <td><code>/etc/php-modules.d</code></td>

build/ansible/group_vars/all.yml

@@ -392,7 +392,7 @@ software_available:
         && git checkout $( git for-each-ref --format='%(*creatordate:raw)%(creatordate:raw) %(refname)' refs/tags | sort -n | grep -E 'tags/9[.0-9]+$' | tail -1 | sed 's|.*/||g' ) \
       command: |
         chown -R ${MY_USER}:${MY_GROUP} /usr/local/src/drush9 \
-        && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && composer install --no-interaction --no-progress --no-dev' \
+        && su - ${MY_USER} -c 'PATH=/usr/local/bin:$PATH; cd /usr/local/src/drush9 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \
         && ln -s /usr/local/src/drush9/drush /usr/local/bin/drush9 \
         && rm -rf /usr/local/src/drush9/.git \
         && rm -rf /usr/local/src/drush9/docs \
@@ -942,13 +942,14 @@ extensions_available:
     5.2:
       type: pecl
       version: 2.0.7
-    5.3:
-      type: pecl
-      version: 2.0.7
     all:
       type: pecl
   imagick:
-    disabled: [5.2, 5.3, 7.4]
+    disabled: [5.2, 7.4]
+    5.3:
+      type: pecl
+      version: 3.3.0
+      run_dep: [libmagickwand-6.q16-2]
     5.4:
       type: pecl
       run_dep: [libmagickwand-6.q16-2]
@@ -1090,7 +1091,10 @@ extensions_available:
       command: yes | pecl install mongo
       build_dep: [libssl-dev, libsasl2-dev]
   mongodb:
-    disabled: [5.2, 5.3]
+    disabled: [5.2]
+    5.3:
+      type: pecl
+      version: 0.6.3
     5.4:
       type: pecl
       version: 1.2.11
@@ -1201,7 +1205,12 @@ extensions_available:
       build_dep: [libpq-dev]
       run_dep: [libpq5]
   phalcon:
-    disabled: [5.2, 5.3, 7.3, 7.4]
+    disabled: [5.2, 7.3, 7.4]
+    5.3:
+      type: git
+      git_url: https://github.com/phalcon/cphalcon
+      git_ref: phalcon-v2.0.9
+      command: cd build && ./install >/dev/null
     5.4:
       type: git
       git_url: https://github.com/phalcon/cphalcon
@@ -1311,7 +1320,11 @@ extensions_available:
   spl:
     disabled: "{{ php_all_versions }}" # TODO: Did not work
   swoole:
-    disabled: [5.2, 5.3]
+    disabled: [5.2]
+    5.3:
+      type: pecl
+      version: 1.9.23
+      run_dep: [libnghttp2-5]
     5.4:
       type: pecl
       version: 1.9.23
@@ -1329,82 +1342,34 @@ extensions_available:
       git_ref: master
       command: |
         git checkout $(git describe --abbrev=0 --tags) \
-        && git submodule update --init --recursive \
-        #`&& cd thirdparty/hiredis` \
-        #`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-        #`&& make install` \
-        #`&& cd ../../` \
-        && cd thirdparty/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-sockets \
+          --enable-http2 \
           --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/` \
+          --enable-coroutine-postgresql \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && make install \
       run_dep: [libnghttp2-14, libhiredis0.13]
-      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake]
+      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, libpq-dev, cmake]
     7.4:
       type: git
       git_url: https://github.com/swoole/swoole-src
       git_ref: master
       command: |
         git checkout $(git describe --abbrev=0 --tags) \
-        && git submodule update --init --recursive \
-        #`&& cd thirdparty/hiredis` \
-        #`&& make -j$(getconf _NPROCESSORS_ONLN)` \
-        #`&& make install` \
-        #`&& cd ../../` \
-        && cd thirdparty/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-sockets \
+          --enable-http2 \
           --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/` \
+          --enable-coroutine-postgresql \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && make install \
       run_dep: [libnghttp2-14, libhiredis0.13]
-      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, cmake]
+      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, libpq-dev, cmake]
     all:
       type: pecl
       build_dep: [libnghttp2-dev, libssl-dev]