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-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-sockets \
-  --enable-swoole \
+  --enable-http2 \
-  --enable-swoole-static \
-  --with-swoole \
-  --with-openssl-dir=/usr \
   --enable-mysqlnd \
-  --enable-coroutine \
+  --enable-coroutine-postgresql \
-  --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 \
  \

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-sockets \
-  --enable-swoole \
+  --enable-http2 \
-  --enable-swoole-static \
-  --with-swoole \
-  --with-openssl-dir=/usr \
   --enable-mysqlnd \
-  --enable-coroutine \
+  --enable-coroutine-postgresql \
-  --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 \
  \

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

@@ -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 \
@@ -1342,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-sockets \
-          --enable-swoole \
+          --enable-http2 \
-          --enable-swoole-static \
-          --with-swoole \
-          --with-openssl-dir=/usr \
           --enable-mysqlnd \
-          --enable-coroutine \
+          --enable-coroutine-postgresql \
-          --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]
+      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-sockets \
-          --enable-swoole \
+          --enable-http2 \
-          --enable-swoole-static \
-          --with-swoole \
-          --with-openssl-dir=/usr \
           --enable-mysqlnd \
-          --enable-coroutine \
+          --enable-coroutine-postgresql \
-          --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]
+      build_dep: [libnghttp2-dev, libssl-dev, libhiredis-dev, libpq-dev, cmake]
     all:
       type: pecl
       build_dep: [libnghttp2-dev, libssl-dev]