Merge branch 'release/v0.12.0'

Author: andreaskoch

CHANGELOG.md

@@ -4,7 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## [Unreleased]
+
+### Added
+- Add a phyMyAdmin container
+
+### Changed
+- Update AOE Scheduler to version "^1"
+- Reference major versions for SMTP Pro, Lesti FPC, Magento Core, AOE Template hints and Scope Hint
+
 ## [v0.11.0] - 2016-11-09
 
 ### Changed
 - Allow access to the Magento Connect Manager (see issue #29)
+- Move the scope hint and qconfig modules to the normal requirements (see pull request #27)

README.md

@@ -84,10 +84,16 @@ Once the installation is finished the installer will print the URL and the crede
 
 ```
 ...
-installer_1     | Frontend: http://dockerized-magento.local/
-installer_1     | Backend: http://dockerized-magento.local/admin
-installer_1     |  - Username: admin
-installer_1     |  - Password: password123
+installer_1      | phpMyAdmin: http://dockerized-magento.local:8080
+installer_1      |  - Username: root
+installer_1      |  - Password: pw
+installer_1      |
+installer_1      | Backend: http://dockerized-magento.local/admin
+installer_1      |  - Username: admin
+installer_1      |  - Password: password123
+installer_1      |
+installer_1      | Frontend: http://dockerized-magento.local/
+
 ```
 
 [![Animation: Installation and first project start](documentation/installation-and-first-start-animation.gif)](https://s3.amazonaws.com/andreaskoch/dockerized-magento/installation/Dockerized-Magento-Installation-Linux-no-sound.mp4)
@@ -126,9 +132,10 @@ The dockerized Magento project consists of the following components:
   1. a [PHP](docker-images/php/Dockerfile) image
   2. a [Nginx](docker-images/nginx/Dockerfile) web server image
   3. a [Solr](docker-images/solr/Dockerfile) search server
-  4. a standard [MySQL](https://registry.hub.docker.com/_/mysql/) database server image
-  5. multiple instances of the standard [Redis](https://registry.hub.docker.com/_/redis/) docker image
-  6. and a [Installer](docker-images/installer/Dockerfile) image which contains all tools for installing the project from scratch using an [install script](docker-images/installer/bin/install.sh)
+  4. a standard [MySQL](https://hub.docker.com/_/mysql/) database server image
+  5. multiple instances of the standard [Redis](https://hub.docker.com/_/redis/) docker image
+	6. a standard [phpMyAdmin](https://hub.docker.com/r/phpmyadmin/phpmyadmin/) image that allows you to access the database on port 8080
+  7. and a [Installer](docker-images/installer/Dockerfile) image which contains all tools for installing the project from scratch using an [install script](docker-images/installer/bin/install.sh)
 - a **[shell script](magento)** for controlling the project: [`./magento <action>`](magento)
 - a [composer-file](composer.json) for managing the **Magento modules**
 - and the [docker-compose.yml](docker-compose.yml)-file which connects all components

composer.json

@@ -4,6 +4,8 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/andreaskoch/dockerized-magento",
   "require": {
+    "avstudnitz/scopehint": "^0.6",
+    "tim-reynolds/magento-qconfig": "1.0",
     "aoepeople/aoe_scheduler": "^1",
     "aschroder/smtp_pro": "^2",
     "gordonlesti/lesti_fpc": "^1",
@@ -15,9 +17,7 @@
   },
   "require-dev": {
     "aoepeople/aoe_profiler": "v0.3.0",
-    "aoepeople/aoe_templatehints": "^0.4",
-    "avstudnitz/scopehint": "^0.6",
-    "tim-reynolds/magento-qconfig": "1.0"
+    "aoepeople/aoe_templatehints": "^0.4"
   },
   "repositories": [
     {

config/installer/bin/install.sh

@@ -26,10 +26,16 @@ function printLogonInformation() {
 	frontendUrl="$baseUrl/"
 	backendUrl="$baseUrl/admin"
 
-	echo "Frontend: $frontendUrl"
+	echo ""
+	echo "phpMyAdmin: $baseUrl:8080"
+	echo " - Username: ${MYSQL_USER}"
+	echo " - Password: ${MYSQL_PASSWORD}"
+	echo ""
 	echo "Backend: $backendUrl"
 	echo " - Username: ${ADMIN_USERNAME}"
 	echo " - Password: ${ADMIN_PASSWORD}"
+	echo ""
+	echo "Frontend: $frontendUrl"
 }
 
 

docker-compose.yml

@@ -74,3 +74,12 @@ fullpagecache:
   image: redis:latest
 sessions:
   image: redis:latest
+phpmyadmin:
+  image: phpmyadmin/phpmyadmin
+  ports:
+    - "8080:80"
+  links:
+    - "mysql:mysql"
+  environment:
+    PMA_HOST: "mysql"
+    PMA_PORT: 3306