Merge pull request #25 from devilbox/release-0.17

Trust custom certificates/CA if you choose to

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 \
 	\
 	\

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 \
 	\
 	\

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]+' \

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]+' \

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]+' \

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]+' \

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]+' \

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]+' \

Dockerfiles/work/data/docker-entrypoint.d/41-update-ca-certificates.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+
+############################################################
+# Functions
+############################################################
+
+###
+### Include certificates/CAs into own system
+###
+update_ca_certificates() {
+	local dir="${1}"
+	local debug="${2}"
+
+	if [ -d "${dir}" ]; then
+		for cert in $( find "${dir}" -name \*.crt ); do
+			name="$( basename "${cert}" )"
+			run "cp ${cert} /usr/local/share/ca-certificates/devilbox-${name}" "${debug}"
+		done
+	fi
+	run "update-ca-certificates" "${debug}"
+}

Dockerfiles/work/data/docker-entrypoint.sh

@@ -182,6 +182,12 @@ run "chmod 0755 /shared/backups" "${DEBUG_LEVEL}"
 run "chmod 0755 /shared/httpd" "${DEBUG_LEVEL}"
 
 
+###
+### Update ca-certificates
+###
+update_ca_certificates "/ca" "${DEBUG_LEVEL}"
+
+
 ###
 ### Startup
 ###

README.md

@@ -697,7 +697,7 @@ Have a look at the following table to see all offered volumes for each Docker im
    <td colspan="3"></td>
   </tr>
   <tr>
-   <td rowspan="2"><strong>work</strong></td>
+   <td rowspan="3"><strong>work</strong></td>
    <td><code>/etc/bashrc-devilbox.d</code></td>
    <td>Mount this directory into your host computer and add custom configuration files for <code>bash</code> and other tools.</td>
   </tr>
@@ -705,6 +705,10 @@ Have a look at the following table to see all offered volumes for each Docker im
    <td><code>/shared/backups</code></td>
    <td>Mount this directory into your host computer to access MySQL backups created by <a href="https://mysqldump-secure.org" >mysqldump-secure</a>.</td>
   </tr>
+  <tr>
+   <td><code>/ca</code></td>
+   <td>Mount this directory into your host computer to bake any *.crt file that is located in there as a trusted SSL entity.</td>
+  </tr>
  </tbody>
 </table>
 
@@ -830,6 +834,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>

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