Merge pull request #67 from devilbox/release-0.52

Fix drush9 build for work container
2025-12-19 15:31:15 +00:00 · 2018-12-08 12:02:10 +01:00
parent 79b9ed1308 2947a465f8
commit a2d43259a4
10 changed files with 22 additions and 118 deletions
--- a/Dockerfiles/mods/Dockerfile-7.3
+++ b/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 \
 \
--- a/Dockerfiles/mods/Dockerfile-7.4
+++ b/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 \
 \
--- a/Dockerfiles/work/Dockerfile-5.6
+++ b/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 \
--- a/Dockerfiles/work/Dockerfile-7.0
+++ b/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 \
--- a/Dockerfiles/work/Dockerfile-7.1
+++ b/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 \
--- a/Dockerfiles/work/Dockerfile-7.2
+++ b/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 \
--- a/Dockerfiles/work/Dockerfile-7.3
+++ b/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 \
--- a/Dockerfiles/work/Dockerfile-7.4
+++ b/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 \
--- a/README.md
+++ b/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>
--- a/build/ansible/group_vars/all.yml
+++ b/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-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]