From fa210bb0f2a3fe7ad9452268c5cfd1e538097e57 Mon Sep 17 00:00:00 2001 From: Fu Cheng Date: Wed, 5 Dec 2018 11:06:57 +1300 Subject: [PATCH] Magento 2.2.7 --- Dockerfile.hbs | 2 +- README.md | 6 +++--- developer/Dockerfile | 8 ++++---- docker-compose-integrator-dev.yml | 2 +- integrator/Dockerfile | 8 ++++---- update.js | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Dockerfile.hbs b/Dockerfile.hbs index 1c9ebe54f..7b210f3ca 100644 --- a/Dockerfile.hbs +++ b/Dockerfile.hbs @@ -13,7 +13,7 @@ RUN curl -sS https://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer COPY ./auth.json $COMPOSER_HOME -RUN requirements="libpng12-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libpng12-dev libfreetype6-dev libicu-dev libxslt1-dev" \ +RUN requirements="libpng12-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libpng12-dev libfreetype6-dev libicu-dev libxslt1-dev unzip" \ && apt-get update \ && apt-get install -y $requirements \ && rm -rf /var/lib/apt/lists/* \ diff --git a/README.md b/README.md index 92cfe2c08..2f0e3361f 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@ This repo converts the [long installation guide](http://devdocs.magento.com/guides/v1.0/install-gde/bk-install-guide.html) of Magento 2 into simple Docker image to use. It uses the same convention as my [Docker image for Magento 1.x](https://github.com/alexcheng1982/docker-magento). -This docker image is based on my [docker-apache2-php7](https://github.com/alexcheng1982/docker-apache2-php7) image for Apache 2 and PHP 7. - -__Note__ This docker image uses the *Contributing developer* profile to install Magento, so it has limitations. See more details [here](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html). +This docker image is based on my [docker-apache2-php7](https://github.com/alexcheng1982/docker-apache2-php7) image for Apache 2 and PHP 7. Please refer to the image label `php_version` for the actual PHP version. **Please note: this Docker image is for development and testing only, not ready for production use. Setting up a Magento 2 production server requires more configurations. Please refer to [official documentations](http://devdocs.magento.com/guides/v2.2/config-guide/deployment/).** @@ -83,6 +81,8 @@ $ docker exec -it install-sampledata The default `docker-compose.yml` uses MySQL as the database and starts [phpMyAdmin](https://www.phpmyadmin.net/). The default URL for phpMyAdmin is `http://localhost:8580`. Use MySQL username and password to log in. +Magento starts support of MySQL 5.7 in version `2.1.2`. Before `2.1.2`, MySQL 5.6 should be used. + ## FAQ ### Where is the database? diff --git a/developer/Dockerfile b/developer/Dockerfile index 807f9e8a5..6a1bd920a 100644 --- a/developer/Dockerfile +++ b/developer/Dockerfile @@ -2,10 +2,10 @@ FROM quay.io/alexcheng1982/apache2-php7:7.1.24 LABEL maintainer="alexcheng1982@gmail.com" LABEL php_version="7.1.24" -LABEL magento_version="2.2.6" -LABEL description="Magento 2.2.6 with PHP 7.1.24" +LABEL magento_version="2.2.7" +LABEL description="Magento 2.2.7 with PHP 7.1.24" -ENV MAGENTO_VERSION 2.2.6 +ENV MAGENTO_VERSION 2.2.7 ENV INSTALL_DIR /var/www/html ENV COMPOSER_HOME /var/www/.composer/ @@ -13,7 +13,7 @@ RUN curl -sS https://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer COPY ./auth.json $COMPOSER_HOME -RUN requirements="libpng12-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libpng12-dev libfreetype6-dev libicu-dev libxslt1-dev" \ +RUN requirements="libpng12-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libpng12-dev libfreetype6-dev libicu-dev libxslt1-dev unzip" \ && apt-get update \ && apt-get install -y $requirements \ && rm -rf /var/lib/apt/lists/* \ diff --git a/docker-compose-integrator-dev.yml b/docker-compose-integrator-dev.yml index e5b371d7c..99e64df66 100644 --- a/docker-compose-integrator-dev.yml +++ b/docker-compose-integrator-dev.yml @@ -1,7 +1,7 @@ version: '3.0' services: web: - build: ./integrator + image: 9a940b8e81ff ports: - "80:80" links: diff --git a/integrator/Dockerfile b/integrator/Dockerfile index da8b9ad6c..7068fb35c 100644 --- a/integrator/Dockerfile +++ b/integrator/Dockerfile @@ -2,10 +2,10 @@ FROM quay.io/alexcheng1982/apache2-php7:7.1.24 LABEL maintainer="alexcheng1982@gmail.com" LABEL php_version="7.1.24" -LABEL magento_version="2.2.6" -LABEL description="Magento 2.2.6 with PHP 7.1.24" +LABEL magento_version="2.2.7" +LABEL description="Magento 2.2.7 with PHP 7.1.24" -ENV MAGENTO_VERSION 2.2.6 +ENV MAGENTO_VERSION 2.2.7 ENV INSTALL_DIR /var/www/html ENV COMPOSER_HOME /var/www/.composer/ @@ -13,7 +13,7 @@ RUN curl -sS https://getcomposer.org/installer | php \ && mv composer.phar /usr/local/bin/composer COPY ./auth.json $COMPOSER_HOME -RUN requirements="libpng12-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libpng12-dev libfreetype6-dev libicu-dev libxslt1-dev" \ +RUN requirements="libpng12-dev libmcrypt-dev libmcrypt4 libcurl3-dev libfreetype6 libjpeg-turbo8 libjpeg-turbo8-dev libpng12-dev libfreetype6-dev libicu-dev libxslt1-dev unzip" \ && apt-get update \ && apt-get install -y $requirements \ && rm -rf /var/lib/apt/lists/* \ diff --git a/update.js b/update.js index 824eb0e6a..df6902485 100644 --- a/update.js +++ b/update.js @@ -6,7 +6,7 @@ const path = require("path"); const commonOptions = { phpVersion: '7.1.24', - magento2Version: '2.2.6', + magento2Version: '2.2.7', }; function readPartial(profile, section) {