Upgrade to PHP 7.1.24

Use new base Docker image with PHP 7.1.24

Dockerfile.hbs

@@ -1,4 +1,4 @@
-FROM alexcheng/apache2-php7:{{phpVersion}}
+FROM quay.io/alexcheng1982/apache2-php7:{{phpVersion}}
 
 LABEL maintainer="[email protected]"
 LABEL version="{{magento2Version}}"

README.md

@@ -6,11 +6,11 @@
 
 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).
 
-For documentation, please refer to the Magento 1.x [repo](https://github.com/alexcheng1982/docker-magento). These two Docker images follow the same instructions. 
+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).
 
-**Please note: this Docker image is for development and testing only, not 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/).**
+**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/).**
 
 ## Magento 2 installation types
 

developer/Dockerfile

@@ -1,4 +1,4 @@
-FROM alexcheng/apache2-php7:7.1.11
+FROM quay.io/alexcheng1982/apache2-php7:7.1.24
 
 LABEL maintainer="[email protected]"
 LABEL version="2.2.6"

docker-compose-dev.yml → docker-compose-developer-dev.yml

@@ -1,7 +1,7 @@
 version: '3.0'
 services:
   web:
-    build: .
+    build: ./developer
     ports:
       - "80:80"
     links:

docker-compose-integrator-dev.yml

@@ -0,0 +1,25 @@
+version: '3.0'
+services:
+  web:
+    build: ./integrator
+    ports:
+      - "80:80"
+    links:
+      - db
+    env_file:
+      - env
+  db:
+    image: mysql:5.6.23
+    volumes:
+      - db-data:/var/lib/mysql/data
+    env_file:
+      - env
+  phpmyadmin:
+    image: phpmyadmin/phpmyadmin
+    container_name: phpmyadmin
+    ports:
+      - "8580:80"
+    links:
+      - db     
+volumes:
+  db-data: 

integrator/Dockerfile

@@ -1,4 +1,4 @@
-FROM alexcheng/apache2-php7:7.1.11
+FROM quay.io/alexcheng1982/apache2-php7:7.1.24
 
 LABEL maintainer="[email protected]"
 LABEL version="2.2.6"

update.js

@@ -5,7 +5,7 @@ const fs = Promise.promisifyAll(require("fs"));
 const path = require("path");
 
 const commonOptions = {
-  phpVersion: '7.1.11',
+  phpVersion: '7.1.24',
   magento2Version: '2.2.6',
 };