Merge pull request #40 from devilbox/release-0.28

Release 0.28: Performance
devilbox · Aug 4, 2018 · c246645 · c246645
2 parents 89cd367 + c8a55c3
commit c246645
Show file tree

Hide file tree

Showing 119 changed files with 5,251 additions and 677 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,6 +23,7 @@ env:
     # DOCKER_PASSWORD
     - secure: "ZRrVOVOkSCS2UxEi1HNF1iKefK4sDT/sPRl1HxMQjLnRRaAMdG0aRnBwQf2YAM2qzhCfN85qt6zZtC4awc2mHiZ88JrAZxBjK6xj4BwOyLbDuzpBsKXnx8Nix+wyYYKSjsC3LOYrsUe+4rvkw3tVvVaX8G2llojwdksF34VDmmHBmzCG/Bsexk7UqC+qw0PZm7BtctQO+IL0btmMDijRDElxfR+AuPvf9JdkhYzw9TOO7Jqd53NssNVGyL+XSV0dfGn8PkZTp1e8D+28pLK4oGVog+Wk7Cq94hSGjk5AkWKvL5441rupG1AA8K3njeDNMKdov4o+dmnkAH7Jh8tjShMhNhoxHce3IzpczjhoE1EyYQcyPf1qdfhV35Xv096iWX5809pp1MZF2oE5eism8JaU9NpGClryVbKVKtup8ko9/tCqz01Czq5Vue40feMkGtdePulg59OhyyPLYldsObw8QlZydkrmgVZe6b+GyybeiHraTfDq4pvTgUrC4Cmm5J3IB5Ig1THEiYKHfRJ5hSSMDDODeBXc8Xh6mFssEVshNx/jbUQWuAVYQFw/GIquVHxr6btbevrWIoD+zmqcc0L98u9pYH8w7b+gMgVJNCC4QQz2NCGGWw9l9/TmLrKJgeXbG18n8D314le1zuna6/VfH9pXIlbNO4hgz5NLHJk="
   matrix:
+    - PHP=5.2
     - PHP=5.3
     - PHP=5.4
     - PHP=5.5
@@ -88,9 +89,6 @@ before_script:
   - ./build/gen-readme.sh "${PHP}"
   - git diff --quiet || { echo "Build Changes"; git diff; git status; false; }
 
-  # Integration tests
-  - true
-
 
 ###
 ### Push to Dockerhub

diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2
@@ -0,0 +1,86 @@
+# Auto-generated via Ansible: edit build/ansible/DOCKERFILES/Dockerfile-base.j2 instead.
+FROM devilbox/php-fpm-5.2
+MAINTAINER "cytopia" <[email protected]>
+
+
+###
+### Labels
+###
+LABEL \
+	name="cytopia's PHP-FPM 5.2 Image" \
+	image="devilbox/php-fpm" \
+	tag="5.2-base" \
+	vendor="devilbox" \
+	license="MIT"
+
+
+###
+### Envs
+###
+ENV MY_USER="devilbox" \
+	MY_GROUP="devilbox" \
+	MY_UID="1000" \
+	MY_GID="1000" \
+	PHP_VERSION="5.2"
+
+
+###
+### User/Group
+###
+RUN set -x \
+	&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
+	&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
+
+
+###
+### Upgrade (install ps)
+###
+RUN set -x \
+	&& apt-get update \
+	&& apt-get upgrade -y \
+	&& apt-get install --no-install-recommends --no-install-suggests -y procps \
+	&& rm -rf /var/lib/apt/lists/*
+
+
+###
+### Configure
+###
+RUN set -x \
+	&& rm -rf /usr/local/etc/php-fpm.d \
+	&& mkdir -p /usr/local/etc/php-fpm.d \
+	&& mkdir -p /var/lib/php/session \
+	&& mkdir -p /var/lib/php/wsdlcache \
+	&& chown -R devilbox:devilbox /var/lib/php/session \
+	&& chown -R devilbox:devilbox /var/lib/php/wsdlcache
+
+
+###
+### Copy files
+###
+COPY ./data/php-ini.d/php-5.2.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-5.2.conf /usr/local/etc/php-fpm.conf
+
+COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
+COPY ./data/docker-entrypoint.d /docker-entrypoint.d
+
+
+###
+### Verify
+###
+RUN set -x \
+	&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \
+	&& /usr/local/sbin/php-fpm --test \
+	&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
+	&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
+
+
+###
+### Ports
+###
+EXPOSE 9000
+
+
+###
+### Entrypoint
+###
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="5.3"
 
 
 ###
@@ -56,12 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-5.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-5.3.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-5.3.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
-COPY ./data/php-fpm.d-docker-5.3.conf /usr/local/etc/php-fpm.d/docker.conf
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="5.4"
 
 
 ###
@@ -56,11 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-5.4.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-5.4.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-5.4.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="5.5"
 
 
 ###
@@ -56,11 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-5.5.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-5.5.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-5.5.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="5.6"
 
 
 ###
@@ -56,11 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-5.6.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-5.6.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-5.6.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="7.0"
 
 
 ###
@@ -56,11 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-7.0.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-7.0.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-7.0.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="7.1"
 
 
 ###
@@ -56,11 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-7.1.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-7.1.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-7.1.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="7.2"
 
 
 ###
@@ -56,11 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-7.2.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-7.2.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-7.2.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
 
 
 ###

diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3
@@ -20,7 +20,8 @@ LABEL \
 ENV MY_USER="devilbox" \
 	MY_GROUP="devilbox" \
 	MY_UID="1000" \
-	MY_GID="1000"
+	MY_GID="1000" \
+	PHP_VERSION="7.3"
 
 
 ###
@@ -56,11 +57,11 @@ RUN set -x \
 ###
 ### Copy files
 ###
-COPY ./data/php.d/php-7.3.ini /usr/local/etc/php/conf.d/yyy-devilbox-01-base.ini
+COPY ./data/php-ini.d/php-7.3.ini /usr/local/etc/php/conf.d/xxx-devilbox-default-php.ini
+COPY ./data/php-fpm.conf/php-fpm-7.3.conf /usr/local/etc/php-fpm.conf
+
 COPY ./data/docker-entrypoint.sh /docker-entrypoint.sh
 COPY ./data/docker-entrypoint.d /docker-entrypoint.d
-COPY ./data/php-fpm.conf /usr/local/etc/php-fpm.conf
-COPY ./data/php-fpm.d /usr/local/etc/php-fpm.d
 
 
 ###

diff --git a/Dockerfiles/base/data/php-fpm.conf b/Dockerfiles/base/data/php-fpm.conf