Merge branch 'release/0.21.0'

Author: mblaschke

CHANGELOG.md

@@ -2,9 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/Dockerfile).
 
-## [Unreleased]
+## [0.21.0] - 2016-03-20
+### Changed
+- Improved entrypoint startup time
+- Removed entrypoint ansible provisioning if not needed
 
-## [0.20.0] - 2016-03-24
+## [0.20.0] - 2016-02-24
 ### Added
 - Added sqlite to base images
 

FIXME.md

@@ -0,0 +1,22 @@
+# FIXME tasks
+Mostly upstream issues (eg. missing or broken packages)
+
+## All PHP 7
+- Missing pear
+
+## Ubuntu 16.04 (PHP 5)
+- Missing xdebug
+- Missing redis
+- Missing pear
+
+## Debian 7 (PHP 5)
+- Missing redis
+
+## Debian 9 (PHP 5)
+- Missing redis
+
+## Ubuntu 16.04 (PHP 7)
+- Missing memcached
+
+## Debian 9 (PHP 7)
+- Missing memcached

_provisioning/apache/centos/bin/service.d/httpd.sh

@@ -1,7 +1,18 @@
 #!/usr/bin/env bash
 set -e
 
+if [[ ! -e "$WEB_DOCUMENT_ROOT" ]]; then
+    echo ""
+    echo "[WARNING] WEB_DOCUMENT_ROOT does not exists with path \"$WEB_DOCUMENT_ROOT\"!"
+    echo ""
+fi
+
 # Apache gets grumpy about PID files pre-existing
 rm -f /var/run/httpd/httpd.pid
 
-exec httpd -DFOREGROUND
+rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX" /opt/docker/etc/httpd/*.conf
+rpl --quiet "<DOCUMENT_ROOT>"  "$WEB_DOCUMENT_ROOT"  /opt/docker/etc/httpd/*.conf
+rpl --quiet "<ALIAS_DOMAIN>"   "$WEB_ALIAS_DOMAIN"   /opt/docker/etc/httpd/*.conf
+rpl --quiet "<SERVERNAME>"     "$HOSTNAME"           /opt/docker/etc/httpd/*.conf
+
+exec httpd -DFOREGROUND

_provisioning/apache/general/bin/service.d/httpd.sh

@@ -10,5 +10,10 @@ fi
 # Apache gets grumpy about PID files pre-existing
 rm -f /var/run/apache2/apache2*.pid
 
+rpl --quiet "<DOCUMENT_INDEX>" "$WEB_DOCUMENT_INDEX" /opt/docker/etc/httpd/*.conf
+rpl --quiet "<DOCUMENT_ROOT>"  "$WEB_DOCUMENT_ROOT"  /opt/docker/etc/httpd/*.conf
+rpl --quiet "<ALIAS_DOMAIN>"   "$WEB_ALIAS_DOMAIN"   /opt/docker/etc/httpd/*.conf
+rpl --quiet "<SERVERNAME>"     "$HOSTNAME"           /opt/docker/etc/httpd/*.conf
+
 source /etc/apache2/envvars
 exec apache2 -DFOREGROUND -DAPACHE_LOCK_DIR

_provisioning/apache/general/provision/roles/webdevops-apache/defaults/main.yml

@@ -3,16 +3,3 @@
 APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
 APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
 DOCUMENT_ROOT:     "{{ lookup('env','WEB_DOCUMENT_ROOT') }}"
-
-HTTPD_VARS:
-  - variable: DOCUMENT_INDEX
-    value:    "{{ lookup('env','WEB_DOCUMENT_INDEX') }}"
-
-  - variable: DOCUMENT_ROOT
-    value:    "{{ lookup('env','WEB_DOCUMENT_ROOT') }}"
-
-  - variable: ALIAS_DOMAIN
-    value:    "{{ lookup('env','WEB_ALIAS_DOMAIN') }}"
-
-  - variable: SERVERNAME
-    value:    "{{ ansible_nodename }}"

_provisioning/apache/general/provision/roles/webdevops-apache/tasks/entrypoint.yml

@@ -3,7 +3,3 @@
 - include: bootstrap.yml
   tags:
     - bootstrap
-
-- include: entrypoint.yml
-  tags:
-    - entrypoint

_provisioning/apache/general/provision/roles/webdevops-apache/tasks/main.yml

@@ -37,6 +37,7 @@ case "$BOOTSTRAP_MODE" in
     "bootstrap")
         # Init and run bootstrap system
         runProvisionBootstrap
+        runProvisionBuild
         ;;
 
     *)

_provisioning/base/general/bin/bootstrap.sh

@@ -66,15 +66,13 @@ function runEntrypoints() {
     ENTRYPOINT_SCRIPT="/opt/docker/bin/entrypoint.d/${TASK}.sh"
 
     if [ -f "$ENTRYPOINT_SCRIPT" ]; then
-        echo "Executing entrypoint \"$(basename $ENTRYPOINT_SCRIPT .sh)\""
         . "$ENTRYPOINT_SCRIPT"
     fi
 
     ###############
     # Run default
     ###############
     if [ -f "/opt/docker/bin/entrypoint.d/default.sh" ]; then
-        echo "Executing default entrypoint"
         . /opt/docker/bin/entrypoint.d/default.sh
     fi
 
@@ -85,8 +83,6 @@ function runEntrypoints() {
  # Run "bootstrap" provisioning
  ##
 function runProvisionBootstrap() {
-    mkdir -p /opt/docker/bin/registry/
-
     for FILE in /opt/docker/provision/bootstrap.d/*.sh; do
         # run custom scripts, only once
         . "$FILE"
@@ -99,12 +95,23 @@ function runProvisionBootstrap() {
     rm -f ${PROVISION_REGISTRY_PATH}/provision.*.bootstrap
 }
 
+###
+ # Run "build" provisioning
+ ##
+function runProvisionBuild() {
+    for FILE in /opt/docker/provision/build.d/*.sh; do
+        # run custom scripts, only once
+        . "$FILE"
+        rm -f -- "$FILE"
+    done
+
+    runDockerProvision build
+}
+
 ###
  # Run "onbuild" provisioning
  ##
 function runProvisionOnBuild() {
-    mkdir -p /opt/docker/bin/registry/
-
     for FILE in /opt/docker/provision/onbuild.d/*.sh; do
         # run custom scripts
         . "$FILE"

_provisioning/base/general/bin/config.sh

@@ -21,6 +21,7 @@ case "$CONTROL_COMMAND" in
     ## main roles
     "provision.role")
         provisionRoleAdd "provision.main.bootstrap"  "$1"
+        provisionRoleAdd "provision.main.build"      "$1"
         provisionRoleAdd "provision.main.onbuild"    "$1"
         provisionRoleAdd "provision.main.entrypoint" "$1"
         ;;
@@ -29,6 +30,10 @@ case "$CONTROL_COMMAND" in
         provisionRoleAdd "provision.main.bootstrap" "$1"
         ;;
 
+    "provision.role.build")
+        provisionRoleAdd "provision.main.build" "$1"
+        ;;
+
     "provision.role.onbuild")
         provisionRoleAdd "provision.main.onbuild" "$1"
         ;;
@@ -40,6 +45,7 @@ case "$CONTROL_COMMAND" in
     ## startup roles
     "provision.role.startup")
         provisionRoleAdd "provision.startup.bootstrap"  "$1"
+        provisionRoleAdd "provision.startup.build"      "$1"
         provisionRoleAdd "provision.startup.onbuild"    "$1"
         provisionRoleAdd "provision.startup.entrypoint" "$1"
         ;;
@@ -48,6 +54,10 @@ case "$CONTROL_COMMAND" in
         provisionRoleAdd "provision.startup.bootstrap" "$1"
         ;;
 
+    "provision.role.startup.build")
+        provisionRoleAdd "provision.startup.build" "$1"
+        ;;
+
     "provision.role.startup.onbuild")
         provisionRoleAdd "provision.startup.onbuild" "$1"
         ;;
@@ -59,6 +69,7 @@ case "$CONTROL_COMMAND" in
     ## startup roles
     "provision.role.finish")
         provisionRoleAdd "provision.finish.bootstrap"  "$1"
+        provisionRoleAdd "provision.finish.build"      "$1"
         provisionRoleAdd "provision.finish.onbuild"    "$1"
         provisionRoleAdd "provision.finish.entrypoint" "$1"
         ;;
@@ -67,6 +78,10 @@ case "$CONTROL_COMMAND" in
         provisionRoleAdd "provision.finish.bootstrap" "$1"
         ;;
 
+    "provision.role.finish.build")
+        provisionRoleAdd "provision.finish.build" "$1"
+        ;;
+
     "provision.role.finish.onbuild")
         provisionRoleAdd "provision.finish.onbuild" "$1"
         ;;