Merge pull request #1 from echo-magento/develop

Develop

Author: adrifkat

README.md

@@ -4,7 +4,19 @@
 
 #  Magento 2 Docker to Development
 
-### Magento 2.4.0 + Apache 2.4 + PHP 7.3 + MariaDB 10.4.13 + Elasticsearch 7.6.0 + Varnish 6.4.0 + Redis + OPCache + N98 Magerun 2 + XDebug
+### Features
+
+- Magento 2.4
+- Apache
+- PHP 7.1, PHP 7.2, PHP 7.3
+- Xdebug
+- Composer 1.10.17
+- MariaDB 10.4.13
+- Elasticsearch 7.6
+- Varnish 6.4
+- Redis
+- MailHog
+- n98-magerun
 
 ### Requirements
 
@@ -47,6 +59,8 @@ rm index.php
 install-magento2
 ```
 
+> If you want to use Varnish use `docker-compose.varnish.yml`
+>
 > If you don't want to use Varnish and Elasticsearch use `docker-compose.light.yml`
 
 ### Panels
@@ -59,14 +73,15 @@ install-magento2
 
 | Commands  | Description  | Options & Examples |
 |---|---|---|
-| `./init`  | If you didn't use the CURL setup command above, please use this command changing the name of the project.  | `./init MYMAGENTO2` |
-| `./start`  | If you continuing not using the CURL you can start your container manually  | |
-| `./stop`  | Stop your project containers  | |
-| `./kill`  | Stops containers and removes containers, networks, volumes, and images created to the specific project  | |
-| `./shell`  | Access your container  | `./shell root` | |
-| `./magento`  | Use the power of the Magento CLI  | |
-| `./n98`  | Use the Magerun commands as you want | |
-| `./grunt-init`  | Prepare to use Grunt  | |
-| `./grunt`  | Use Grunt specifically in your theme or completely, it'll do the deploy and the watcher.  | `./grunt luma` |
-| `./xdebug`  |  Enable / Disable the XDebug | |
-| `./composer`  |  Use Composer commands | `./composer update` |
+| `bin/init`  | If you didn't use the CURL setup command above, please use this command changing the name of the project.  | `./init MYMAGENTO2` |
+| `bin/start`  | If you continuing not using the CURL you can start your container manually  | |
+| `bin/stop`  | Stop your project containers  | |
+| `bin/kill`  | Stops containers and removes containers, networks, volumes, and images created to the specific project  | |
+| `bin/shell`  | Access your container  | `./shell root` | |
+| `bin/magento`  | Use the power of the Magento CLI  | |
+| `bin/magento-basic`  | All basic Magento CLI commands (setup:upgrade, setup:di:compile, setup:static-content:deploy -f, cache:clean, cache:flush)  | |
+| `bin/n98`  | Use the Magerun commands as you want | |
+| `bin/grunt-init`  | Prepare to use Grunt  | |
+| `bin/grunt`  | Use Grunt specifically in your theme or completely, it'll do the deploy and the watcher.  | `./grunt luma` |
+| `bin/xdebug`  |  Enable / Disable the XDebug | |
+| `bin/composer`  |  Use Composer commands | `./composer update` |

backups/.gitkeep

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+docker-compose exec --user www-data apache /var/www/html/bin/magento setup:upgrade
+docker-compose exec --user www-data apache /var/www/html/bin/magento setup:di:compile
+docker-compose exec --user www-data apache /var/www/html/bin/magento setup:static-content:deploy -f
+docker-compose exec --user www-data apache /var/www/html/bin/magento cache:clean
+docker-compose exec --user www-data apache /var/www/html/bin/magento cache:flush

composer renamed to bin/composer

@@ -0,0 +1,127 @@
+FROM php:7.1-apache
+
+MAINTAINER echo <echo.magento@gmail.com>
+
+ENV XDEBUG_PORT 9000
+
+# Install System Dependencies
+
+RUN apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+	software-properties-common \
+	&& apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
+	nodejs \
+	libfreetype6-dev \
+	libicu-dev \
+    libssl-dev \
+	libjpeg62-turbo-dev \
+	libmcrypt-dev \
+	libedit-dev \
+	libedit2 \
+	libxslt1-dev \
+	libzip-dev \
+	apt-utils \
+	gnupg \
+	redis-tools \
+	mariadb-client \
+	git \
+	vim \
+	wget \
+	curl \
+	lynx \
+	psmisc \
+	unzip \
+	tar \
+	cron \
+	bash-completion \
+	&& apt-get clean
+
+# Install Magento Dependencies
+
+RUN docker-php-ext-configure \
+  	gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; \
+  	docker-php-ext-install \
+  	opcache \
+  	gd \
+  	bcmath \
+  	intl \
+  	mbstring \
+  	pdo_mysql \
+  	soap \
+  	xsl \
+  	zip \
+  	sockets
+
+# Install oAuth
+
+RUN apt-get update \
+  	&& apt-get install -y \
+  	libpcre3 \
+  	libpcre3-dev \
+  	# php-pear \
+  	&& pecl install oauth \
+  	&& echo "extension=oauth.so" > /usr/local/etc/php/conf.d/docker-php-ext-oauth.ini
+
+# Install Node, NVM, NPM and Grunt
+
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  	&& apt-get install -y nodejs build-essential \
+    && npm i -g grunt-cli yarn
+
+# Install Composer
+
+RUN	curl -sS https://getcomposer.org/installer | php -- --version=1.10.17 --install-dir=/usr/local/bin/ --filename=composer
+
+# Install Code Sniffer
+
+RUN git clone https://github.com/magento/marketplace-eqp.git ~/.composer/vendor/magento/marketplace-eqp
+RUN cd ~/.composer/vendor/magento/marketplace-eqp && composer install
+RUN ln -s ~/.composer/vendor/magento/marketplace-eqp/vendor/bin/phpcs /usr/local/bin;
+
+ENV PATH="/var/www/.composer/vendor/bin/:${PATH}"
+
+# Install XDebug
+
+RUN yes | pecl install xdebug && \
+	 echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.iniOLD
+
+# Install Mhsendmail
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install golang-go \
+   && mkdir /opt/go \
+   && export GOPATH=/opt/go \
+   && go get github.com/mailhog/mhsendmail
+
+# Install Magerun 2
+
+RUN wget https://files.magerun.net/n98-magerun2.phar \
+	&& chmod +x ./n98-magerun2.phar \
+	&& mv ./n98-magerun2.phar /usr/local/bin/
+
+# Configuring system
+
+ADD /.docker/config/php.ini /usr/local/etc/php/php.ini
+ADD /.docker/config/magento.conf /etc/apache2/sites-available/magento.conf
+ADD /.docker/config/custom-xdebug.ini /usr/local/etc/php/conf.d/custom-xdebug.ini
+COPY /.docker/bin/* /usr/local/bin/
+COPY /.docker/users/* /var/www/
+RUN chmod +x /usr/local/bin/*
+RUN ln -s /etc/apache2/sites-available/magento.conf /etc/apache2/sites-enabled/magento.conf
+
+RUN curl -o /etc/bash_completion.d/m2install-bash-completion https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install-bash-completion
+RUN curl -o /etc/bash_completion.d/n98-magerun2.phar.bash https://raw.githubusercontent.com/netz98/n98-magerun2/master/res/autocompletion/bash/n98-magerun2.phar.bash
+RUN echo "source /etc/bash_completion" >> /root/.bashrc
+RUN echo "source /etc/bash_completion" >> /var/www/.bashrc
+
+RUN chmod 777 -Rf /var/www /var/www/.* \
+	&& chown -Rf www-data:www-data /var/www /var/www/.* \
+	&& usermod -u 1000 www-data \
+	&& chsh -s /bin/bash www-data\
+	&& a2enmod rewrite \
+	&& a2enmod headers
+
+RUN su -c "composer global require hirak/prestissimo" -s /bin/sh www-data
+
+VOLUME /var/www/html
+WORKDIR /var/www/html

grunt renamed to bin/grunt

@@ -0,0 +1,127 @@
+FROM php:7.2-apache
+
+MAINTAINER echo <echo.magento@gmail.com>
+
+ENV XDEBUG_PORT 9000
+
+# Install System Dependencies
+
+RUN apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+	software-properties-common \
+	&& apt-get update \
+	&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
+	nodejs \
+	libfreetype6-dev \
+	libicu-dev \
+    libssl-dev \
+	libjpeg62-turbo-dev \
+	libmcrypt-dev \
+	libedit-dev \
+	libedit2 \
+	libxslt1-dev \
+	libzip-dev \
+	apt-utils \
+	gnupg \
+	redis-tools \
+	mariadb-client \
+	git \
+	vim \
+	wget \
+	curl \
+	lynx \
+	psmisc \
+	unzip \
+	tar \
+	cron \
+	bash-completion \
+	&& apt-get clean
+
+# Install Magento Dependencies
+
+RUN docker-php-ext-configure \
+  	gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/; \
+  	docker-php-ext-install \
+  	opcache \
+  	gd \
+  	bcmath \
+  	intl \
+  	mbstring \
+  	pdo_mysql \
+  	soap \
+  	xsl \
+  	zip \
+  	sockets
+
+# Install oAuth
+
+RUN apt-get update \
+  	&& apt-get install -y \
+  	libpcre3 \
+  	libpcre3-dev \
+  	# php-pear \
+  	&& pecl install oauth \
+  	&& echo "extension=oauth.so" > /usr/local/etc/php/conf.d/docker-php-ext-oauth.ini
+
+# Install Node, NVM, NPM and Grunt
+
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
+  	&& apt-get install -y nodejs build-essential \
+    && npm i -g grunt-cli yarn
+
+# Install Composer
+
+RUN	curl -sS https://getcomposer.org/installer | php -- --version=1.10.17 --install-dir=/usr/local/bin/ --filename=composer
+
+# Install Code Sniffer
+
+RUN git clone https://github.com/magento/marketplace-eqp.git ~/.composer/vendor/magento/marketplace-eqp
+RUN cd ~/.composer/vendor/magento/marketplace-eqp && composer install
+RUN ln -s ~/.composer/vendor/magento/marketplace-eqp/vendor/bin/phpcs /usr/local/bin;
+
+ENV PATH="/var/www/.composer/vendor/bin/:${PATH}"
+
+# Install XDebug
+
+RUN yes | pecl install xdebug && \
+	 echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.iniOLD
+
+# Install Mhsendmail
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install golang-go \
+   && mkdir /opt/go \
+   && export GOPATH=/opt/go \
+   && go get github.com/mailhog/mhsendmail
+
+# Install Magerun 2
+
+RUN wget https://files.magerun.net/n98-magerun2.phar \
+	&& chmod +x ./n98-magerun2.phar \
+	&& mv ./n98-magerun2.phar /usr/local/bin/
+
+# Configuring system
+
+ADD /.docker/config/php.ini /usr/local/etc/php/php.ini
+ADD /.docker/config/magento.conf /etc/apache2/sites-available/magento.conf
+ADD /.docker/config/custom-xdebug.ini /usr/local/etc/php/conf.d/custom-xdebug.ini
+COPY /.docker/bin/* /usr/local/bin/
+COPY /.docker/users/* /var/www/
+RUN chmod +x /usr/local/bin/*
+RUN ln -s /etc/apache2/sites-available/magento.conf /etc/apache2/sites-enabled/magento.conf
+
+RUN curl -o /etc/bash_completion.d/m2install-bash-completion https://raw.githubusercontent.com/yvoronoy/m2install/master/m2install-bash-completion
+RUN curl -o /etc/bash_completion.d/n98-magerun2.phar.bash https://raw.githubusercontent.com/netz98/n98-magerun2/master/res/autocompletion/bash/n98-magerun2.phar.bash
+RUN echo "source /etc/bash_completion" >> /root/.bashrc
+RUN echo "source /etc/bash_completion" >> /var/www/.bashrc
+
+RUN chmod 777 -Rf /var/www /var/www/.* \
+	&& chown -Rf www-data:www-data /var/www /var/www/.* \
+	&& usermod -u 1000 www-data \
+	&& chsh -s /bin/bash www-data\
+	&& a2enmod rewrite \
+	&& a2enmod headers
+
+RUN su -c "composer global require hirak/prestissimo" -s /bin/sh www-data
+
+VOLUME /var/www/html
+WORKDIR /var/www/html

grunt-init renamed to bin/grunt-init

@@ -48,7 +48,6 @@ RUN docker-php-ext-configure \
   	intl \
   	mbstring \
   	mysqli \
-  	mcrypt \
   	pdo_mysql \
   	soap \
   	xsl \
@@ -73,8 +72,7 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \
 
 # Install Composer
 
-RUN	curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer
-RUN composer global require hirak/prestissimo
+RUN	curl -sS https://getcomposer.org/installer | php -- --version=1.10.17 --install-dir=/usr/local/bin/ --filename=composer
 
 # Install Code Sniffer
 
@@ -124,5 +122,7 @@ RUN chmod 777 -Rf /var/www /var/www/.* \
 	&& a2enmod rewrite \
 	&& a2enmod headers
 
+RUN su -c "composer global require hirak/prestissimo" -s /bin/sh www-data
+
 VOLUME /var/www/html
 WORKDIR /var/www/html

init renamed to bin/init

@@ -3,17 +3,18 @@ services:
   apache:
     build:
       context: .
-      dockerfile: build/apache/Dockerfile
+      dockerfile: build/apache/php-7.3/Dockerfile
     ports:
       - "80:80"
       - "9001:9000" # xdebug
     volumes:
       - ./src:/var/www/html
-      - ~/.composer:/var/www/.composer
+      - ~/.composer/cache:/var/www/.composer/cache
       - ~/.npm:/var/www/.npm
     environment:
       XDEBUG_CONFIG: "remote_host=localhost"
       PHP_IDE_CONFIG: "serverName=Docker"
+#      VIRTUAL_HOST: "example.localhost"
     depends_on:
       - db
     links:
@@ -32,6 +33,7 @@ services:
       - MYSQL_PASSWORD=admin123
     volumes:
       - dbdata:/var/lib/mysql
+      - ./backups:/var/tmp/backups
     networks:
       - <project_name>-network