update readme: include hhvm and new logo

Add hhvm

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*]
+charset = utf-8
+
+[{Dockerfile,docker-compose.yml}]
+indent_style = space
+indent_size = 4

.env

@@ -0,0 +1,2 @@
+INSTALL_PRESTISSIMO=false
+PHP_PROCESS_MANAGER=php-fpm

.gitignore

@@ -1 +1,3 @@
-/logs
+/logs
+/data
+.env

caddy/Caddyfile

@@ -0,0 +1,12 @@
+# Docs: https://caddyserver.com/docs/caddyfile
+0.0.0.0:80
+fastcgi / php-fpm:9000 php
+rewrite {
+    to /index.php?{query}
+}
+browse
+log stdout
+errors stdout
+# Uncomment to enable TLS (HTTPS)
+# Change the first list to listen on port 443 when enabling TLS
+#tls self_signed

caddy/Dockerfile

@@ -0,0 +1,22 @@
+FROM alpine:3.4
+MAINTAINER Eric Pfeiffer <computerfr33k@users.noreply.github.com>
+
+LABEL caddy_version="0.9.0" architecture="amd64"
+
+RUN apk update \
+ && apk upgrade \
+ && apk add tar curl
+
+RUN curl --silent --show-error --fail --location \
+      --header "Accept: application/tar+gzip, application/x-gzip, application/octet-stream" -o - \
+      "https://github.com/mholt/caddy/releases/download/v0.9.0/caddy_linux_amd64.tar.gz" \
+    | tar --no-same-owner -C /usr/bin/ -xz caddy_linux_amd64 \
+ && mv /usr/bin/caddy_linux_amd64 /usr/bin/caddy \
+ && chmod 0755 /usr/bin/caddy \
+ && /usr/bin/caddy -version
+
+EXPOSE 80 443 2015
+WORKDIR /var/www/laravel/public
+
+ENTRYPOINT ["caddy"]
+CMD ["-conf", "/etc/Caddyfile"]

docker-compose.yml

@@ -5,45 +5,50 @@ services:
 ### Nginx Server Container ##################################
 
     nginx:
-        build: ./nginx
+        build:
+            context: ./nginx
+            args:
+                - PHP_UPSTREAM=${PHP_PROCESS_MANAGER}
         volumes_from:
-            - php
+            - volumes_source
         volumes:
             - ./logs/nginx/:/var/log/nginx
         ports:
             - "80:80"
+            - "443:443"
         links:
-            - php
+            - ${PHP_PROCESS_MANAGER}
 
-### PHP Container ###########################################
+### PHP-FPM Container #######################################
 
-    php:
+    php-fpm:
         build:
-            context: ./php
-            dockerfile: Dockerfile-php-70
-        volumes:
-            - ../:/var/www/laravel
-            - ./logs/php/:/usr/local/var/log
+            context: ./php-fpm
+            dockerfile: Dockerfile-70
+        volumes_from:
+            - volumes_source
         expose:
             - "9000"
+        links:
+            - workspace
 
-### DATA Container ##########################################
+### HHVM Container ##########################################
 
-    data:
-        build: ./data
-        volumes:
-            - /var/lib/mysql
-            - /var/lib/postgres
-            - /var/lib/mariadb
-            - /var/lib/redis
-            - /var/lib/memcached
+    hhvm:
+        build: ./hhvm
+        volumes_from:
+            - volumes_source
+        expose:
+            - "9000"
+        links:
+            - workspace
 
 ### MySQL Container #########################################
 
     mysql:
         build: ./mysql
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -51,30 +56,26 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        links:
-            - php
 
 ### PostgreSQL Container ####################################
 
     postgres:
         build: ./postgres
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "5432:5432"
         environment:
             POSTGRES_DB: homestead
             POSTGRES_USER: homestead
             POSTGRES_PASSWORD: secret
-        links:
-            - php
 
 ### MariaDB Container #######################################
 
-    mariadb:  
+    mariadb:
         build: ./mariadb
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "3306:3306"
         environment:
@@ -82,30 +83,47 @@ services:
             MYSQL_USER: homestead
             MYSQL_PASSWORD: secret
             MYSQL_ROOT_PASSWORD: root
-        links:
-            - php
+
+### Neo4j Container #########################################
+
+    neo4j:
+        build: ./neo4j
+        ports:
+            - "7474:7474"
+            - "1337:1337"
+        environment:
+            - NEO4J_AUTH=homestead:secret
+        volumes_from:
+            - volumes_data
+
+### MongoDB Container #######################################
+
+    mongo:
+        build: ./mongo
+        ports:
+            - "27017:27017"
+        volumes_from:
+            - volumes_data
 
 ### Redis Container #########################################
 
     redis:
         build: ./redis
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "6379:6379"
-        links:
-            - php
 
 ### Memcached Container #####################################
 
     memcached:
         build: ./memcached
         volumes_from:
-            - data
+            - volumes_data
         ports:
             - "11211:11211"
         links:
-            - php
+            - php-fpm
 
 ### Beanstalkd Container ####################################
 
@@ -115,9 +133,9 @@ services:
             - "11300:11300"
         privileged: true
         links:
-            - php
+            - php-fpm
 
-### Beanstalkd-Console Container ############################
+### Beanstalkd Console Container ############################
 
     beanstalkd-console:
         build: ./beanstalkd-console
@@ -126,4 +144,51 @@ services:
         links:
             - beanstalkd
 
+### Workspace Utilities Container ###########################
+
+    workspace:
+        build:
+            context: ./workspace
+            args:
+                - INSTALL_PRESTISSIMO=false
+        volumes_from:
+            - volumes_source
+        tty: true
+
+### Laravel Application Code Container ######################
+
+    volumes_source:
+        build: ./volumes/application
+        volumes:
+            - ../:/var/www/laravel
+
+### Databases Data Container ################################
+
+    volumes_data:
+        build: ./volumes/data
+        volumes:
+            - /var/lib/mysql:/var/lib/mysql
+            - /var/lib/postgres:/var/lib/postgres
+            - /var/lib/mariadb:/var/lib/mariadb
+            - /var/lib/memcached:/var/lib/memcached
+            - /var/lib/redis:/data
+            - /var/lib/neo4j:/var/lib/neo4j/data
+            - /var/lib/mongo:/data/db
+            
+### Caddy Server Container ##################################
+# Edit the Caddyfile if needed (./caddy/Caddyfile)
+
+    caddy:
+        build: ./caddy
+        volumes_from:
+            - volumes_source
+        ports:
+            - "80:80"
+            - "443:443"
+            - "2015:2015"
+        volumes:
+            - ./caddy/Caddyfile:/etc/Caddyfile
+        links:
+            - php-fpm
+
 ### Add more Containers below ###############################

hhvm/Dockerfile

@@ -0,0 +1,21 @@
+FROM ubuntu:14.04  
+
+RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 
+RUN apt-get update -y && apt-get install -y software-properties-common \
+   && add-apt-repository "deb http://dl.hhvm.com/ubuntu $(lsb_release -sc) main" \
+   && apt-get update -y \
+   && apt-get install -y hhvm \
+   && apt-get clean \
+   && rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /var/www/laravel
+
+ADD server.ini /etc/hhvm/server.ini
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["/usr/bin/hhvm", "-m", "server", "-c", "/etc/hhvm/server.ini"]
+
+EXPOSE 9000

hhvm/server.ini

@@ -0,0 +1,20 @@
+; php options
+
+pid = /var/run/hhvm/pid
+
+; hhvm specific
+hhvm.server.port = 9000
+hhvm.server.type = fastcgi
+hhvm.server.default_document = index.php
+hhvm.server.error_document404 = index.php
+hhvm.server.upload.upload_max_file_size = 25M
+hhvm.log.level = Error
+hhvm.log.header = true
+hhvm.log.access[default][file] = /var/log/hhvm/access.log
+hhvm.log.access[default][format] = "%h %l %u %t \"%r\" %>s %b"
+hhvm.server.source_root=/var/www/laravel/public
+hhvm.repo.central.path = /var/run/hhvm/hhvm.hhbc
+
+; Uncomment to log to files instead of STDOUT
+;hhvm.log.use_log_file = true
+;hhvm.log.file = /var/log/hhvm/error.log

mongo/Dockerfile

@@ -0,0 +1,12 @@
+FROM mongo:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+#COPY mongo.conf /usr/local/etc/mongo/mongo.conf
+
+VOLUME /data/db /data/configdb
+
+CMD ["mongod"]
+
+EXPOSE 27017
+

neo4j/Dockerfile

@@ -0,0 +1,7 @@
+FROM tpires/neo4j
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+VOLUME /var/lib/neo4j/data
+
+EXPOSE 7474 1337

nginx/Dockerfile

@@ -5,7 +5,9 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ADD nginx.conf /etc/nginx/
 ADD laravel.conf /etc/nginx/sites-available/
 
-RUN echo "upstream php-upstream { server php:9000; }" > /etc/nginx/conf.d/upstream.conf
+ARG PHP_UPSTREAM
+
+RUN echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
 
 RUN usermod -u 1000 www-data
 

nginx/nginx.conf

@@ -15,10 +15,11 @@ http {
   tcp_nodelay on;
   keepalive_timeout 15;
   types_hash_max_size 2048;
+  client_max_body_size 20M;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log off;
-  error_log off;
+  access_log on;
+  error_log on;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;

php-fpm/Dockerfile-55

@@ -0,0 +1,52 @@
+FROM php:5.5-fpm
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
+RUN apt-get update && apt-get install -y \
+    libpq-dev \
+    libmemcached-dev \
+    curl \
+    libjpeg-dev \
+    libpng12-dev \
+    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
+
+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
+# configure gd library
+RUN docker-php-ext-configure gd \
+    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
+    --with-freetype-dir=/usr/include/freetype2
+
+# Install extensions using the helper script provided by the base image
+RUN docker-php-ext-install \
+    pdo_mysql \
+    pdo_pgsql \
+    gd
+
+# Install memcached
+RUN pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php-fpm/Dockerfile-56

@@ -0,0 +1,52 @@
+FROM php:5.6-fpm
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
+RUN apt-get update && apt-get install -y \
+    libpq-dev \
+    libmemcached-dev \
+    curl \
+    libjpeg-dev \
+    libpng12-dev \
+    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
+
+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
+# configure gd library
+RUN docker-php-ext-configure gd \
+    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
+    --with-freetype-dir=/usr/include/freetype2
+
+# Install extensions using the helper script provided by the base image
+RUN docker-php-ext-install \
+    pdo_mysql \
+    pdo_pgsql \
+    gd
+
+# Install memcached
+RUN pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php-fpm/Dockerfile-70

@@ -0,0 +1,63 @@
+FROM php:7.0-fpm
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+ADD ./laravel.ini /usr/local/etc/php/conf.d
+ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
+
+RUN apt-get update && apt-get install -y \
+    libpq-dev \
+    libmemcached-dev \
+    curl \
+    libjpeg-dev \
+    libpng12-dev \
+    libfreetype6-dev \
+    libssl-dev \
+    libmcrypt-dev \
+    --no-install-recommends \
+    && rm -r /var/lib/apt/lists/*
+
+# install mcrypt library
+RUN docker-php-ext-install mcrypt
+
+# Install mongodb driver
+RUN pecl install mongodb
+
+# configure gd library
+RUN docker-php-ext-configure gd \
+    --enable-gd-native-ttf \
+    --with-jpeg-dir=/usr/lib \
+    --with-freetype-dir=/usr/include/freetype2
+
+# Install extensions using the helper script provided by the base image
+RUN docker-php-ext-install \
+    pdo_mysql \
+    pdo_pgsql \
+    gd
+
+# Install Memcached for php 7
+RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz" \
+    && mkdir -p memcached \
+    && tar -C memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
+    && ( \
+        cd memcached \
+        && phpize \
+        && ./configure \
+        && make -j$(nproc) \
+        && make install \
+    ) \
+    && rm -r memcached \
+    && rm /tmp/memcached.tar.gz \
+    && docker-php-ext-enable memcached
+
+# Install xdebug
+RUN pecl install xdebug \
+    && docker-php-ext-enable xdebug
+
+RUN usermod -u 1000 www-data
+
+WORKDIR /var/www/laravel
+
+CMD ["php-fpm"]
+
+EXPOSE 9000

php-fpm/laravel.ini

@@ -0,0 +1,14 @@
+date.timezone=UTC
+display_errors=Off
+log_errors=On
+extension=mongodb.so
+
+; Maximum amount of memory a script may consume (128MB)
+; http://php.net/memory-limit
+memory_limit = 128M
+; Maximum allowed size for uploaded files.
+; http://php.net/upload-max-filesize
+upload_max_filesize = 20M
+; Sets max size of post data allowed.
+; http://php.net/post-max-size
+post_max_size = 20M

php/Dockerfile-php-55

@@ -1,28 +0,0 @@
-FROM php:5.5-fpm
-
-MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
-
-ADD ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
-
-RUN apt-get update && apt-get install \
-    libpq-dev -y \
-    libmemcached-dev \
-    curl
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql
-
-#Install memcached
-RUN pecl install memcached \
-    && docker-php-ext-enable memcached
-
-RUN usermod -u 1000 www-data
-
-WORKDIR /var/www/laravel
-
-CMD ["php-fpm"]
-
-EXPOSE 9000

php/Dockerfile-php-56

@@ -1,28 +0,0 @@
-FROM php:5.6-fpm
-
-MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
-
-ADD ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
-
-RUN apt-get update && apt-get install \
-    libpq-dev -y \
-    libmemcached-dev \
-    curl
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql
-
-#Install memcached
-RUN pecl install memcached \
-    && docker-php-ext-enable memcached
-
-RUN usermod -u 1000 www-data
-
-WORKDIR /var/www/laravel
-
-CMD ["php-fpm"]
-
-EXPOSE 9000

php/Dockerfile-php-70

@@ -1,32 +0,0 @@
-FROM php:7.0-fpm
-
-MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
-
-ADD ./laravel.ini /usr/local/etc/php/conf.d
-ADD ./laravel.pool.conf /usr/local/etc/php-fpm.d/
-
-RUN apt-get update && apt-get install \
-	libpq-dev -y \
-    curl \
-    libmemcached-dev
-
-# Install extensions using the helper script provided by the base image
-RUN docker-php-ext-install \
-    pdo_mysql \
-    pdo_pgsql
-
-# Install Memcached for php 7
-RUN curl -L -o /tmp/memcached.tar.gz "https://github.com/php-memcached-dev/php-memcached/archive/php7.tar.gz" \
-    && mkdir -p /usr/src/php/ext/memcached \
-    && tar -C /usr/src/php/ext/memcached -zxvf /tmp/memcached.tar.gz --strip 1 \
-    && docker-php-ext-configure memcached \
-    && docker-php-ext-install memcached \
-    && rm /tmp/memcached.tar.gz
-
-RUN usermod -u 1000 www-data
-
-WORKDIR /var/www/laravel
-
-CMD ["php-fpm"]
-
-EXPOSE 9000

php/laravel.ini

@@ -1,3 +0,0 @@
-date.timezone = UTC
-display_errors = Off
-log_errors = On

redis/Dockerfile

@@ -4,6 +4,8 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 #COPY redis.conf /usr/local/etc/redis/redis.conf
 
-CMD [ "redis-server" ]
+VOLUME /data
 
 EXPOSE 6379
+
+CMD ["redis-server"]

volumes/application/Dockerfile

@@ -0,0 +1,7 @@
+FROM debian:jessie
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+WORKDIR /var/www/laravel
+
+CMD ["true"]

workspace/Dockerfile

@@ -0,0 +1,97 @@
+FROM phusion/baseimage:latest
+
+MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
+
+RUN DEBIAN_FRONTEND=noninteractive
+RUN locale-gen en_US.UTF-8
+
+ENV LANGUAGE=en_US.UTF-8
+ENV LC_ALL=en_US.UTF-8
+ENV LC_CTYPE=UTF-8
+ENV LANG=en_US.UTF-8
+ENV TERM xterm
+
+# Install "software-properties-common" (for the "add-apt-repository")
+RUN apt-get update && apt-get install -y \
+    software-properties-common
+
+# Add the "PHP 7" ppa
+RUN add-apt-repository -y \
+    ppa:ondrej/php
+
+# Install PHP-CLI 7, some PHP extentions and some useful Tools with APT
+RUN apt-get update && apt-get install -y --force-yes \
+        php7.0-cli \
+        php7.0-common \
+        php7.0-curl \
+        php7.0-json \
+        php7.0-xml \
+        php7.0-mbstring \
+        php7.0-mcrypt \
+        php7.0-mysql \
+        php7.0-pgsql \
+        php7.0-sqlite \
+        php7.0-sqlite3 \
+        php7.0-zip \
+        php7.0-memcached \
+        php7.0-gd \
+        php7.0-xdebug \
+        php-dev \
+        libcurl4-openssl-dev \
+        libedit-dev \
+        libssl-dev \
+        libxml2-dev \
+        xz-utils \
+        sqlite3 \
+        libsqlite3-dev \
+        git \
+        curl \
+        vim \
+        nano \
+        pkg-config
+
+# Clean up, to free some space
+RUN apt-get clean
+
+# remove load xdebug extension (only load on phpunit command)
+RUN sed -i 's/^/;/g' /etc/php/7.0/cli/conf.d/20-xdebug.ini
+
+# Add bin folder of composer to PATH.
+RUN echo "export PATH=${PATH}:/var/www/laravel/vendor/bin" >> ~/.bashrc
+
+# Install Composer
+RUN curl -s http://getcomposer.org/installer | php \
+    && mv composer.phar /usr/local/bin/composer
+
+# Load xdebug Zend extension with phpunit command
+RUN echo "alias phpunit='php -dzend_extension=xdebug.so /var/www/laravel/vendor/bin/phpunit'" >> ~/.bashrc
+
+# Install mongodb extension
+RUN pecl install mongodb
+RUN echo "extension=mongodb.so" >> /etc/php/7.0/cli/php.ini
+
+# Install nvm (Node Version Manager)
+RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
+
+ENV NVM_DIR=/root/.nvm
+
+# Install stable node
+RUN . ~/.nvm/nvm.sh \
+    && nvm install stable \
+    && nvm use stable \
+    && nvm alias stable \
+    && npm install -g gulp bower
+
+# Source the bash
+RUN . ~/.bashrc
+
+# Clean up
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+WORKDIR /var/www/laravel
+
+# Install optional software
+ARG INSTALL_PRESTISSIMO=false
+RUN if [ "$INSTALL_PRESTISSIMO" = true ] ; then \
+        composer global require "hirak/prestissimo:^0.3"; \
+    fi