improved app's docker usability

Author: Nemanja Ognjanovic

README.md

@@ -4,7 +4,9 @@
 [![Coverage Status](https://coveralls.io/repos/github/phpsrbija/unfinished/badge.svg)](https://coveralls.io/github/phpsrbija/unfinished)
 [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/phpsrbija/unfinished/badges/quality-score.png?s=4023c984fc1163a44f4220cd7d57406643ced9f2)](https://scrutinizer-ci.com/g/phpsrbija/unfinished/)
 
-## Instalation
+## Installation
+
+### Vagrant (Recommended)
 
 ```
 git clone https://github.com/phpsrbija/unfinished.git
@@ -21,6 +23,23 @@ Admin is at http://unfinished.test/admin
 user: [email protected]    
 pass: testtest
 
+### Docker
+
+```
+git clone https://github.com/phpsrbija/unfinished.git
+cd unfinished
+docker-compose up
+docker-compose run php composer install
+docker-compose run php bin/setup-db.sh docker
+
+```
+
+Open in your browser http://localhost and voila!
+
+Admin is at http://localhost/admin  
+user: [email protected]    
+pass: testtest
+
 ## Our main philosophy of software architecture
 
 Packages, packages and packages... 

application/bin/setup-db.sh

@@ -1,4 +1,8 @@
 #!/usr/bin/env bash
+MODE=$1;
+if [ "$MODE" != "docker" ]; then
+MODE="vagrant"
+fi
 
 echo "
 ────────────────────────────────────────────────────────────────────────────────────────────────────────
@@ -11,6 +15,13 @@ fi
 if [ ! -f /var/www/unfinished/config/autoload/local.php ]; then
     cp /var/www/unfinished/config/autoload/local.php.dist /var/www/unfinished/config/autoload/local.php
 fi
+if [ "$MODE" = "docker" ]; then
+sed -i -e 's/localhost/mysql/g' /var/www/unfinished/data/phinx/phinx.php
+sed -i -e 's/root/unfinished/g' /var/www/unfinished/data/phinx/phinx.php
+
+sed -i -e 's/host=localhost/host=mysql/g' /var/www/unfinished/config/autoload/local.php
+sed -i -e "s/'username' => 'root'/'username' => 'unfinished'/g" /var/www/unfinished/config/autoload/local.php
+fi
 
 echo "
 ────────────────────────────────────────────────────────────────────────────────────────────────────────

docker-compose.yml

@@ -7,22 +7,23 @@ services:
       volumes_from:
           - app
   php:
-      #restart: always
-      build: ./docker/php7.0-fpm/
-      ##build: .
-      #restart: always
-      #image: phpdockerio/php7-fpm
+      build:
+          context: ./docker/php7.0-fpm
+          dockerfile: ./Dockerfile
       expose:
           - 9000
       volumes_from:
           - app
+      tty: true
+      working_dir: /var/www/unfinished
   app:
-      image: phpdockerio/php7-fpm
+      build:
+          context: ./docker/app
+          dockerfile: ./Dockerfile
       volumes:
           - ./application:/var/www/unfinished
       command: "true"
   mysql:
-#      build: ./mysql/
       image: mysql:latest
       volumes_from:
           - data
@@ -47,4 +48,3 @@ services:
       image: redis
       expose:
           - 6379
-      #command: "start"

docker/app/Dockerfile

@@ -0,0 +1 @@
+FROM phpdockerio/php7-fpm

docker/mysql/Dockerfile

@@ -1,6 +1,2 @@
 FROM mysql:latest
 COPY ./mysqld.cnf /etc/mysql/mysql.conf.d/mysqld.cnf
-
-# add to your machine
-#RUN mysql -u root -psecret -e 'create database pulsonlinepulsar_testing;'
-#RUN cat /etc/mysql/mysql.conf.d/mysqld.cnf

docker/php7.0-fpm/Dockerfile

@@ -1,18 +1,16 @@
 FROM phpdockerio/php7-fpm
-#COPY ./www.conf /etc/php5/fpm/pool.d/www.conf
 
-WORKDIR /var/www/unfinished
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 # Install dependencies
-RUN apt-get update && \
-    apt-get -y install curl \
+RUN apt-get update \
+    && \
+    apt-get install -y -o Dpkg::Options::=--force-confdef \
     vim \
-    php7.0-xdebug \
     php7.0-mysql \
-    php7.0-mbstring && \
+    php7.0-xdebug \
+    php7.0-mbstring \
+    && \
     curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
-
-RUN sed -i 's/;daemonize = yes/daemonize = no/g' /etc/php/7.0/fpm/php-fpm.conf
-
-#CMD ["/usr/sbin/php7.0-fpm"]
+RUN sed -i 's/;daemonize = yes/daemonize = no/g' /etc/php/7.0/fpm/php-fpm.conf