Merge branch 'php-docker-boilerplate' into develop

# Conflicts:
#	documentation/PROJECT-SYMFONY.md
#	etc/environment.yml

Author: mblaschke

CHANGELOG.md

@@ -8,6 +8,7 @@ PHP Docker Boilerplate Changelog
 - Ansible provisioning
 - Real production and development provisioning
 - Added cloud support (without host mounted volumes)
+- Moved `code/` to `app/` (Moved `/application/code` to `/app` inside Docker container)
 
 4.1.0 - canceled
 ------------------

Dockerfile.cloud

@@ -3,31 +3,43 @@
 #++++++++++++++++++++++++++++++++++++++
 #
 # PHP-Versions:
-#  ubuntu-12.04 -> PHP 5.3, LTS (precise)
-#  ubuntu-14.04 -> PHP 5.5, LTS (trusty)
-#  ubuntu-15.04 -> PHP 5.6 (vivid)
-#  ubuntu-15.10 -> PHP 5.6 (wily)
-#  centos-7 -> PHP 5.4
+#  ubuntu-12.04 -> PHP 5.3         (precise)  LTS
+#  ubuntu-14.04 -> PHP 5.5         (trusty)   LTS
+#  ubuntu-15.04 -> PHP 5.6         (vivid)
+#  ubuntu-15.10 -> PHP 5.6         (wily)
+#  ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial)   LTS
+#  centos-7     -> PHP 5.4
+#  debian-7     -> PHP 5.4         (wheezy)
+#  debian-8     -> PHP 5.6 and 7.x (jessie)
+#  debian-9     -> PHP 5.6 and 7.0 (stretch)
 #
 # Apache:
 #   webdevops/php-apache:ubuntu-12.04
 #   webdevops/php-apache:ubuntu-14.04
 #   webdevops/php-apache:ubuntu-15.04
 #   webdevops/php-apache:ubuntu-15.10
+#   webdevops/php-apache:ubuntu-16.04
+#   webdevops/php-apache:ubuntu-16.04-php7
 #   webdevops/php-apache:centos-7
 #   webdevops/php-apache:debian-7
 #   webdevops/php-apache:debian-8
 #   webdevops/php-apache:debian-8-php7
+#   webdevops/php-apache:debian-9
+#   webdevops/php-apache:debian-9-php7
 #
 # Nginx:
 #   webdevops/php-nginx:ubuntu-12.04
 #   webdevops/php-nginx:ubuntu-14.04
 #   webdevops/php-nginx:ubuntu-15.04
 #   webdevops/php-nginx:ubuntu-15.10
+#   webdevops/php-nginx:ubuntu-16.04
+#   webdevops/php-nginx:ubuntu-16.04-php7
 #   webdevops/php-nginx:centos-7
 #   webdevops/php-nginx:debian-7
 #   webdevops/php-nginx:debian-8
 #   webdevops/php-nginx:debian-8-php7
+#   webdevops/php-nginx:debian-9
+#   webdevops/php-nginx:debian-9-php7
 #
 # HHVM:
 #   webdevops/hhvm-apache
@@ -43,15 +55,12 @@ ENV PROVISION_CONTEXT "production"
 COPY etc/             /opt/docker/etc/
 COPY provision/       /opt/docker/provision/
 
-COPY code/            /application/code/
+COPY app/             /app/
 
 RUN /opt/docker/bin/control.sh provision.role.startup boilerplate-main \
     && /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
-    && /opt/docker/bin/control.sh service.enable cron \
-    && /opt/docker/bin/control.sh service.enable dnsmasq \
     && /opt/docker/bin/bootstrap.sh
 
 # Configure volume/workdir
-RUN mkdir -p /application/code/
-VOLUME /application/
-WORKDIR /application/code/
+RUN mkdir -p /app/
+WORKDIR /app/

Dockerfile.development

@@ -3,31 +3,43 @@
 #++++++++++++++++++++++++++++++++++++++
 #
 # PHP-Versions:
-#  ubuntu-12.04 -> PHP 5.3, LTS (precise)
-#  ubuntu-14.04 -> PHP 5.5, LTS (trusty)
-#  ubuntu-15.04 -> PHP 5.6 (vivid)
-#  ubuntu-15.10 -> PHP 5.6 (wily)
-#  centos-7 -> PHP 5.4
+#  ubuntu-12.04 -> PHP 5.3         (precise)  LTS
+#  ubuntu-14.04 -> PHP 5.5         (trusty)   LTS
+#  ubuntu-15.04 -> PHP 5.6         (vivid)
+#  ubuntu-15.10 -> PHP 5.6         (wily)
+#  ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial)   LTS
+#  centos-7     -> PHP 5.4
+#  debian-7     -> PHP 5.4         (wheezy)
+#  debian-8     -> PHP 5.6 and 7.x (jessie)
+#  debian-9     -> PHP 5.6 and 7.0 (stretch)
 #
 # Apache:
 #   webdevops/php-apache:ubuntu-12.04
 #   webdevops/php-apache:ubuntu-14.04
 #   webdevops/php-apache:ubuntu-15.04
 #   webdevops/php-apache:ubuntu-15.10
+#   webdevops/php-apache:ubuntu-16.04
+#   webdevops/php-apache:ubuntu-16.04-php7
 #   webdevops/php-apache:centos-7
 #   webdevops/php-apache:debian-7
 #   webdevops/php-apache:debian-8
 #   webdevops/php-apache:debian-8-php7
+#   webdevops/php-apache:debian-9
+#   webdevops/php-apache:debian-9-php7
 #
 # Nginx:
 #   webdevops/php-nginx:ubuntu-12.04
 #   webdevops/php-nginx:ubuntu-14.04
 #   webdevops/php-nginx:ubuntu-15.04
 #   webdevops/php-nginx:ubuntu-15.10
+#   webdevops/php-nginx:ubuntu-16.04
+#   webdevops/php-nginx:ubuntu-16.04-php7
 #   webdevops/php-nginx:centos-7
 #   webdevops/php-nginx:debian-7
 #   webdevops/php-nginx:debian-8
 #   webdevops/php-nginx:debian-8-php7
+#   webdevops/php-nginx:debian-9
+#   webdevops/php-nginx:debian-9-php7
 #
 # HHVM:
 #   webdevops/hhvm-apache
@@ -46,11 +58,8 @@ COPY provision/       /opt/docker/provision/
 RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
     && /opt/docker/bin/control.sh provision.role boilerplate-main-development \
     && /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
-    && /opt/docker/bin/control.sh service.enable cron \
-    && /opt/docker/bin/control.sh service.enable dnsmasq \
-    && /opt/docker/bin/control.sh service.enable postfix \
     && /opt/docker/bin/bootstrap.sh
 
 # Configure volume/workdir
-RUN mkdir -p /application/code/
-WORKDIR /application/code/
+RUN mkdir -p /app/
+WORKDIR /app/

Dockerfile.production

@@ -3,31 +3,43 @@
 #++++++++++++++++++++++++++++++++++++++
 #
 # PHP-Versions:
-#  ubuntu-12.04 -> PHP 5.3, LTS (precise)
-#  ubuntu-14.04 -> PHP 5.5, LTS (trusty)
-#  ubuntu-15.04 -> PHP 5.6 (vivid)
-#  ubuntu-15.10 -> PHP 5.6 (wily)
-#  centos-7 -> PHP 5.4
+#  ubuntu-12.04 -> PHP 5.3         (precise)  LTS
+#  ubuntu-14.04 -> PHP 5.5         (trusty)   LTS
+#  ubuntu-15.04 -> PHP 5.6         (vivid)
+#  ubuntu-15.10 -> PHP 5.6         (wily)
+#  ubuntu-16.04 -> PHP 5.6 and 7.0 (xenial)   LTS
+#  centos-7     -> PHP 5.4
+#  debian-7     -> PHP 5.4         (wheezy)
+#  debian-8     -> PHP 5.6 and 7.x (jessie)
+#  debian-9     -> PHP 5.6 and 7.0 (stretch)
 #
 # Apache:
 #   webdevops/php-apache:ubuntu-12.04
 #   webdevops/php-apache:ubuntu-14.04
 #   webdevops/php-apache:ubuntu-15.04
 #   webdevops/php-apache:ubuntu-15.10
+#   webdevops/php-apache:ubuntu-16.04
+#   webdevops/php-apache:ubuntu-16.04-php7
 #   webdevops/php-apache:centos-7
 #   webdevops/php-apache:debian-7
 #   webdevops/php-apache:debian-8
 #   webdevops/php-apache:debian-8-php7
+#   webdevops/php-apache:debian-9
+#   webdevops/php-apache:debian-9-php7
 #
 # Nginx:
 #   webdevops/php-nginx:ubuntu-12.04
 #   webdevops/php-nginx:ubuntu-14.04
 #   webdevops/php-nginx:ubuntu-15.04
 #   webdevops/php-nginx:ubuntu-15.10
+#   webdevops/php-nginx:ubuntu-16.04
+#   webdevops/php-nginx:ubuntu-16.04-php7
 #   webdevops/php-nginx:centos-7
 #   webdevops/php-nginx:debian-7
 #   webdevops/php-nginx:debian-8
 #   webdevops/php-nginx:debian-8-php7
+#   webdevops/php-nginx:debian-9
+#   webdevops/php-nginx:debian-9-php7
 #
 # HHVM:
 #   webdevops/hhvm-apache
@@ -45,11 +57,8 @@ COPY provision/       /opt/docker/provision/
 
 RUN /opt/docker/bin/control.sh provision.role boilerplate-main \
     && /opt/docker/bin/control.sh provision.role.startup boilerplate-deployment \
-    && /opt/docker/bin/control.sh service.enable cron \
-    && /opt/docker/bin/control.sh service.enable dnsmasq \
-    && /opt/docker/bin/control.sh service.enable postfix \
     && /opt/docker/bin/bootstrap.sh
 
 # Configure volume/workdir
-RUN mkdir -p /application/code/
-WORKDIR /application/code/
+RUN mkdir -p /app/
+WORKDIR /app/

Makefile

@@ -37,23 +37,23 @@ rebuild:
 #############################
 
 mysql-backup:
-	docker-compose run --rm --no-deps main root bash /application/bin/backup.sh mysql
+	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh mysql
 
 mysql-restore:
-	docker-compose run --rm --no-deps main root bash /application/bin/restore.sh mysql
+	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh mysql
 
 #############################
 # Solr
 #############################
 
 solr-backup:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main root bash /application/bin/backup.sh solr
+	docker-compose run --rm --no-deps main root bash /docker/bin/backup.sh solr
 	docker-compose start solr
 
 solr-restore:
 	docker-compose stop solr
-	docker-compose run --rm --no-deps main root bash /application/bin/restore.sh solr
+	docker-compose run --rm --no-deps main root bash /docker/bin/restore.sh solr
 	docker-compose start solr
 
 #############################

code/.gitkeep renamed to app/.gitkeep

@@ -0,0 +1,3 @@
+<?php
+
+phpinfo();

app/index.php

@@ -39,7 +39,7 @@ case "$1" in
         fi
 
         logMsg "Starting Solr backup..."
-        tar jcPf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" /data/solr/
+        tar jcPf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" /storage/solr/
         logMsg "Finished"
         ;;
 esac

bin/backup.sh

@@ -35,8 +35,8 @@ case "$1" in
     "solr")
         if [ -f "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" ]; then
             logMsg "Starting Solr restore..."
-            rm -rf /data/solr/* && mkdir -p /data/solr/
-            chmod 777 /data/solr/
+            rm -rf /storage/solr/* && mkdir -p /storage/solr/
+            chmod 777 /storage/solr/
             tar jxPf "${BACKUP_DIR}/${BACKUP_SOLR_FILE}" -C /
             logMsg "Finished"
         else

bin/restore.sh

@@ -69,7 +69,7 @@ mysql:
 #  volumes_from:
 #    - storage
 #  environment:
-#    - SOLR_STORAGE=/data/solr/server-master/
+#    - SOLR_STORAGE=/storage/solr/server-master/
 #  env_file:
 #    - etc/environment.yml
 #    - etc/environment.production.yml

docker-compose.cloud.yml

@@ -18,8 +18,9 @@ main:
     - "8443:443"
     - "10022:22"
   volumes:
-    - ./:/application/
+    - ./app/:/app/
     - /tmp/debug/:/tmp/debug/
+    - ./:/docker/
   volumes_from:
     - storage
   # cap and privileged needed for slowlog
@@ -75,7 +76,7 @@ mysql:
 #  volumes_from:
 #    - storage
 #  environment:
-#    - SOLR_STORAGE=/data/solr/server-master/
+#    - SOLR_STORAGE=/storage/solr/server-master/
 #  env_file:
 #    - etc/environment.yml
 #    - etc/environment.development.yml

docker-compose.development.yml

@@ -18,7 +18,7 @@ main:
     - "8443:443"
     - "10022:22"
   volumes:
-    - ./:/application/
+    - ./app/:/app/
   volumes_from:
     - storage
   env_file:
@@ -68,7 +68,7 @@ mysql:
 #  volumes_from:
 #    - storage
 #  environment:
-#    - SOLR_STORAGE=/data/solr/server-master/
+#    - SOLR_STORAGE=/storage/solr/server-master/
 #  env_file:
 #    - etc/environment.yml
 #    - etc/environment.production.yml

docker-compose.production.yml

@@ -31,7 +31,7 @@ RUN ln -s /opt/solr/contrib         /opt/solr/example/solr/contrib
 # Fix rights
 RUN chown solr:solr -R /opt/solr/example/solr/
 
-VOLUME "/data"
+VOLUME "/storage"
 
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["solr"]
+CMD ["solr"]

docker/solr/Dockerfile

@@ -91,7 +91,7 @@ Hostname                         | IP or Hostname of VM
 Port                             | 8000
 Debugger                         | Xdebug  
 Use path mappings                | Check
-Path mapping of folder 'code'    | /docker/code/
+Path mapping of folder 'app'     | /app/
 
 ### 2.) Add a debug connection (Run -> Edit Configurations... -> Connections) and create a new configuration (PHP Web Application).
 
@@ -105,5 +105,5 @@ Save, set a break point and test the debugger.
 
 ## Application cache
 
-Symlink your application cache (eg. typo3temp/) to `/data/cache/` and it will be stored inside the `storage` container
+Symlink your application cache (eg. typo3temp/) to `/storage/cache/` and it will be stored inside the `storage` container
 so it will be accessible within all containers (eg. web or main).

documentation/DOCKER-INFO.md

@@ -23,14 +23,14 @@ Now create your project inside the docker boilerplate:
 - [Running any other php based project](PROJECT-OTHER.md)
 - [Running existing project](PROJECT-EXISTING.md)
 
-For an existing project just put your files into `code/` folder or use git to clone your project into `code/`.
+For an existing project just put your files into `app/` folder or use git to clone your project into `app/`.
 
 ## Advanced usage (git)
 
 Use this boilerplate as template and customize it for each project. Put this Docker
 configuration for each project into separate git repositories.
 
-Now set your existing project repository to be a git submodule in `code/`.
+Now set your existing project repository to be a git submodule in `app/`.
 Every developer now needs only to clone the Docker repository with `--recursive` option
 to get both, the Docker configuration and the TYPO3 installation.
 

documentation/DOCKER-STARTUP.md

@@ -15,11 +15,6 @@ the much faster virtualisation (networking, disk access, shared folders) compare
 There is also a [Vagrant VM for VirtualBox, VMware and Parallels](https://github.com/webdevops/vagrant-docker-vm)
 with a mailcatcher (Postfix with Dovecot, catches all outgoing mails).
 
-_Warning:_ Boot2docker is not recommended because of slow/buggy file sharing between host and guest and there is no
-convenient way to access the box with Samba or SSH.
-This Docker boilerplate tries to avoid common anti-patterns like a Samba/SSH container because Boot2docker
-isn't able to handle such tasks.
-
 For more convenience use [CliTools.phar](https://github.com/webdevops/clitools) (will also run on native Linux, not only inside a Vagrant box)
 
 ## First startup

documentation/INSTALL.md

@@ -12,7 +12,7 @@ make create git https://github..../
 
 or manually
 ```bash
-git clone --recursive https://github..../ code/
+git clone --recursive https://github..../ app/
 ```
 
 Check `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `etc/environment*.yml`

documentation/PROJECT-EXISTING.md

@@ -4,7 +4,7 @@
 
 ## Create project
 
-- Put your project files into `code/`
+- Put your project files into `app/`
 - If needed modify `DOCUMENT_ROOT` and `DOCUMENT_INDEX` in `etc/environment*.yml`
 - You're done - really
 

documentation/PROJECT-OTHER.md

@@ -80,4 +80,4 @@ Host          | ftp
 Ports         | 20,21
 User          | dev (if not changed in env)
 Password      | dev (if not changed in env)
-Path          | /data/ftp (if not changed in env)
+Path          | /storage/ftp (if not changed in env)

documentation/SERVICES.md

@@ -16,7 +16,7 @@ docker-compose up -d
 
 ## Complete reset
 
-Reset all containers, delete all data (`mysql`, `solr` ..) but not your project files in `code/`!
+Reset all containers, delete all data (`mysql`, `solr` ..) but not your project files in `app/`!
 
 ```bash
 docker-compose stop