From 3a29a77925867a731eaea17b72ff723b82556e0d Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 7 Dec 2018 18:53:23 +0100 Subject: [PATCH 1/5] Fix drush9 build for work container --- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- build/ansible/group_vars/all.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 736be4d2..5a92dc58 100644 --- 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 && 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 2769d260..56572500 100644 --- 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 && 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 6594fbf9..3ed2b274 100644 --- 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 && 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index d025d8ff..9877dbc6 100644 --- 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 && 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 3c82f292..457ac803 100644 --- 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 && 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 1b21e71e..dc172348 100644 --- 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 && 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 \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index f5f8c08b..f859b800 100644 --- 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 && 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 \ From 8d2eee37f1aa948a678de54b4d1270c6d1bbda12 Mon Sep 17 00:00:00 2001 From: cytopia Date: Fri, 7 Dec 2018 18:55:09 +0100 Subject: [PATCH 2/5] Fix #66 typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 50176b7c..91c16c59 100644 --- 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 /etc/php-fpm-custom.d - Mount this directory into your host computer and add custom PHP-FOM \*.conf files in order to alter PHP-FPM behaviour. + Mount this directory into your host computer and add custom PHP-FPM \*.conf files in order to alter PHP-FPM behaviour. /etc/php-modules.d From 68f11781f1a63052bbfbe52c5badc55d61e42a88 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Dec 2018 01:53:48 +0100 Subject: [PATCH 3/5] Fix memory limit for drush9 install --- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- build/ansible/group_vars/all.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 5a92dc58..5333a23a 100644 --- 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' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 56572500..d5b290b9 100644 --- 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' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 3ed2b274..c49c4515 100644 --- 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' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 9877dbc6..08b66856 100644 --- 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' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 457ac803..cef131cf 100644 --- 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' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index dc172348..5e54b127 100644 --- 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' \ +&& 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 \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index f859b800..b6a105cf 100644 --- 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' \ + && 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 \ From 9f280dd5b1b8f6a867f0a4ed8f7f265e2e5bdd6d Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Dec 2018 02:07:05 +0100 Subject: [PATCH 4/5] Fix swoole build for PHP 7.3 and PHP 7.4 --- Dockerfiles/mods/Dockerfile-7.3 | 30 ++------------- Dockerfiles/mods/Dockerfile-7.4 | 30 ++------------- build/ansible/group_vars/all.yml | 64 ++++---------------------------- 3 files changed, 14 insertions(+), 110 deletions(-) diff --git a/Dockerfiles/mods/Dockerfile-7.3 b/Dockerfiles/mods/Dockerfile-7.3 index f1353e34..2b4548fe 100644 --- 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 \ \ diff --git a/Dockerfiles/mods/Dockerfile-7.4 b/Dockerfiles/mods/Dockerfile-7.4 index c8c7061a..dbcda9bf 100644 --- 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 \ \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index b6a105cf..fa396fa0 100644 --- a/build/ansible/group_vars/all.yml +++ b/build/ansible/group_vars/all.yml @@ -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] From 2947a465f80780c3780169a4ef1395eb43c5a4d6 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sat, 8 Dec 2018 02:21:54 +0100 Subject: [PATCH 5/5] Remove extra spaces --- Dockerfiles/work/Dockerfile-5.6 | 2 +- Dockerfiles/work/Dockerfile-7.0 | 2 +- Dockerfiles/work/Dockerfile-7.1 | 2 +- Dockerfiles/work/Dockerfile-7.2 | 2 +- Dockerfiles/work/Dockerfile-7.3 | 2 +- Dockerfiles/work/Dockerfile-7.4 | 2 +- build/ansible/group_vars/all.yml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 5333a23a..29279149 100644 --- 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 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index d5b290b9..18f35835 100644 --- 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 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index c49c4515..706510c1 100644 --- 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 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 08b66856..290e13c0 100644 --- 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 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index cef131cf..1959844a 100644 --- 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 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \ +&& 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 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 5e54b127..6ff0dc12 100644 --- 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 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \ +&& 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 \ diff --git a/build/ansible/group_vars/all.yml b/build/ansible/group_vars/all.yml index fa396fa0..b8d33ccd 100644 --- 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 && php -d memory_limit=-1 `which composer` install --no-interaction --no-progress' \ + && 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 \