[2.0.0] Release

Author: Igor Sydorenko

CHANGELOG.md

@@ -1,9 +1,21 @@
 # Changelog
 
+## [2.0.0] - 2019-03-05
+### Added
+- MailHog container
+- Redis container
+- Container names
+- Certificate generation for web container
+- healthcheck for db container
+
+### Updated
+- Documentation
+- Renamed hostname
+
 ## [1.0.0] - 2018-08-15
 ### Added
 - CHANGELOG.md file to keep changes between versions.
-- README.dm file for repository description.
+- README.md file for repository description.
 - docker-compose.yml file with directives to run required containers.
 - php/Dockerfile with instructions to raise php-fpm with required extensions and scripts to install Magento2 instance.
 - nginx/Dockerfile to raise latest nginx image and copy configuration file from host to container.

README.md

@@ -1 +1,103 @@
-# Magento 2 Docker project
+# Magento 2 Docker for Developer project
+
+Using this docker project you can initiate a new project or import the existent one.
+
+## Preparation
+1. Open https://www.docker.com/
+1. Register new account or login with an existent one
+1. Download and install docker app
+
+
+## Install a vanilla Magento
+1. Import "magento2-docker" repository
+2. Open "magento2-docker" folder in terminal app
+3. Create "magento" folder: 
+`mkdir magento`
+4. Build and run all docker components:
+`docker-compose up --build`
+5. After configuration is build and running open a new terminal tab and connect to php container:
+`docker exec -it php bash`
+6. Open "magento" folder and verify that the folder is empty:
+`cd /var/www/magento; ls -la`
+7. Choose your approach below and install the project
+
+7.1 If you want to install a vanilla Magento instance you need to go to https://devdocs.magento.com/guides/v2.3/install-gde/composer.html 
+and create a new project to the current directory.
+
+Example:
+`composer create-project --repository=https://repo.magento.com/ magento/project-enterprise-edition .`
+
+7.2 If you want to install an existent project you need to clone project repository to the "magento" folder:
+`git clone <--project_repository_url--> .`
+
+When prompted, enter your Magento authentication keys.
+
+8\. Once composer install is done run Magento install command:
+```
+php bin/magento setup:install \
+        --db-host=db \
+        --db-name=magento \
+        --db-user=magento \
+        --db-password=123123q \
+        --base-url=http://magento.local \
+        --backend-frontname=admin \
+        --admin-user=admin \
+        --admin-password=123123q \
+        --admin-email=admin@test.com \
+        --admin-firstname=Magento \
+        --admin-lastname=User \
+        --language=en_US \
+        --currency=USD \
+        --timezone=America/Chicago \
+        --skip-db-validation \
+    && chown -R www-data:www-data .
+```
+
+9\. Update your laptop hosts file: `127.0.0.1 magento.local`
+
+10\. Open http://magento.local/
+
+## Connect to containers via SSH
+Docker configuration contains such components as:
+- web (nginx service)
+- php (php-fpm service)
+- db (MySQL service)
+- redis (redis service)
+- mail (mailhog mail service)
+
+For connecting to container via SSH you need use the command:
+`docker exec -it <--container_name--> bash`, where <--container_name--> is container name
+
+Example:
+`docker exec -it web`
+
+## Reloading services
+
+### Reload ngnix
+```
+docker exec -it web
+/etc/init.d/nginx reload
+```
+
+### Reload php
+```
+docker docker-compose restart php
+```
+
+## Connect to MySQL from your laptop
+You're able to connect to MySQL using "0.0.0.0" as host, port should be default one - "3306", credentials from .env file
+
+## Using MailHog for sending emails
+You're able to find all the email you send from Magento instance on http://localhost:8025/
+
+## Switch to PHP 7.x
+1\. Shutdown your current docker instance
+
+2\. Change PHP version in ./php/Docker file to needed version
+
+Example: 
+
+If you need to change PHP version from 7.2 to 7.1 you need to change `FROM php:7.2-fpm` to `FROM php:7.1-fpm`
+
+3\. Build and run all docker components:
+`docker-compose up --build`

docker-compose.yml

@@ -1,32 +1,45 @@
 version: "3"
 services:
     web:
+        container_name: web
         build: ./nginx
         ports:
           - "80:80"
         links:
           - php
         volumes:
-          - magento:/var/www/magento
-          - magento-vendor:/var/www/magento/vendor
+          - ./magento:/var/www/magento
     php:
+        container_name: php
         build: ./php
         expose:
           - 9000
         volumes:
-          - magento:/var/www/magento
-          - magento-vendor:/var/www/magento/vendor
+          - ./magento:/var/www/magento
         depends_on:
           - db
     db:
+        container_name: db
         image: mariadb:latest
+        ports:
+          - "3306:3306"
         expose:
           - 3306
-        environment:
-          MYSQL_ROOT_PASSWORD: 123123q
-          MYSQL_DATABASE: magento
-          MYSQL_USER: magento
-          MYSQL_PASSWORD: 123123q
+        env_file: .env
+        healthcheck:
+            test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost", "-p$MYSQL_ROOT_PASSWORD"]
+            timeout: 20s
+            retries: 10
+    mailhog:
+        container_name: mail
+        image: mailhog/mailhog:latest
+        links:
+          - php
+        ports:
+          - "1025:1025"
+          - "8025:8025"
+    redis:
+        container_name: redis
+        image: redis:latest
 volumes:
     magento:
-    magento-vendor:

nginx/Dockerfile

@@ -1,3 +1,11 @@
 FROM nginx:latest
 
-COPY ./conf/test.com.conf /etc/nginx/conf.d/test.com.conf
+RUN apt-get update && apt-get install -y \
+    vim \
+    nano
+
+COPY ./conf/magento.local.conf /etc/nginx/conf.d/magento.local.conf
+
+RUN apt-get -qq update && apt-get -qq -y install openssl && mkdir -p /etc/nginx/ssl && cd /etc/nginx/ssl
+RUN cd /etc/nginx/ssl && openssl req -newkey rsa:2048 -nodes -keyout magento.key -x509 -days 365 \
+   -out magento.pem -subj "/C=UA/ST=Kyiv/L=Kyiv/O=magento.local/OU=magento.local/CN=magento.local"

nginx/conf/test.com.conf nginx/conf/magento.local.confnginx/conf/test.com.conf renamed to nginx/conf/magento.local.conf

@@ -1,7 +1,7 @@
 server {
     listen      80;
     listen      [::]:80;
-    server_name test.com;
+    server_name magento.local;
 
     set $MAGE_MODE production;
     set $MAGE_ROOT /var/www/magento;

php/Dockerfile

@@ -1,46 +1,40 @@
-FROM php:7.0-fpm
+FROM php:7.2-fpm
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get -qq install -y \
     apt-utils \
     git \
     curl \
     unzip \
+    vim \
+    nano \
     libmcrypt-dev \
     libicu-dev \
     libxml2-dev libxslt1-dev \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
     mysql-client \
+    ssmtp \
+    mailutils \
     && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
     && docker-php-ext-configure hash --with-mhash \
-    && docker-php-ext-install -j$(nproc) mcrypt intl xsl gd zip pdo_mysql opcache soap bcmath json iconv
+    && docker-php-ext-install -j$(nproc) intl xsl gd zip pdo_mysql opcache soap bcmath json iconv pcntl sockets
 
-RUN git clone https://github.com/magento/magento2.git /var/www/magento \
-    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+# Install xdebug extension
+RUN pecl install xdebug-2.6.1 && docker-php-ext-enable xdebug \
+    && echo "xdebug.default_enable = 0" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.idekey = PHPSTORM" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.remote_enable = 1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.remote_host = host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
+    && echo "xdebug.remote_port = 9007" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
-WORKDIR /var/www/magento
+# Configure MailHog
+RUN echo "mailhub=mail:1025" >> /etc/ssmtp/ssmtp.conf \
+    && echo 'sendmail_path = "/usr/sbin/ssmtp -t"' > /usr/local/etc/php/conf.d/mail.ini
+
+# Install Composer
+RUN cd /usr/src && curl -sS http://getcomposer.org/installer | php
+RUN cd /usr/src && mv composer.phar /usr/bin/composer
 
-RUN composer install \
-    && find var generated vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \; \
-    && find var vendor generated pub/static pub/media app/etc -type d -exec chmod u+w {} \; \
-    && chmod u+x bin/magento \
-    && chown -R www-data:www-data .
+WORKDIR /var/www/magento
 
-CMD php bin/magento setup:install \
-    	--db-host=db \
-    	--db-name=magento \
-    	--db-user=magento \
-    	--db-password=123123q \
-    	--base-url=http://test.com \
-    	--backend-frontname=admin \
-    	--admin-user=admin \
-    	--admin-password=123123q \
-    	--admin-email=admin@test.com \
-    	--admin-firstname=Magento \
-    	--admin-lastname=User \
-    	--language=en_US \
-    	--currency=USD \
-    	--timezone=America/Chicago \
-    	--skip-db-validation \
-    && chown -R www-data:www-data . \
-    && php-fpm
+CMD php-fpm