From 20090814f42187946536ba92f97c11d6db321148 Mon Sep 17 00:00:00 2001 From: Ralf Siepker Date: Thu, 18 Aug 2016 21:27:05 +0200 Subject: [PATCH 01/12] update to actual versions --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 97a21d63..d3c16316 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,8 @@ "aschroder/smtp_pro": "v2.0.5", "gordonlesti/lesti_fpc": "1.3.6", "jeroenvermeulen/solarium": "v1.6.9-beta", - "magento-hackathon/magento-composer-installer": "v2.1.1", - "magento/core": "1.9.1.0-patch1" + "magento-hackathon/magento-composer-installer": "3.0.6", + "magento/core": "1.9.2.4" }, "require-dev": { "aoepeople/aoe_profiler": "v0.3.0", From 09b0005c1558c2f2491e9dc7ed51b777e7d79850 Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Thu, 13 Oct 2016 22:22:49 +0200 Subject: [PATCH 02/12] Use autobuild images from docker hub To speed up the initial startup process I have exchanged the locally built docker images for the installer, Nginx, PHP and Solr to docker images that are automatically built from this repository: https://hub.docker.com/r/andreaskoch/dockerized-magento-installer https://hub.docker.com/r/andreaskoch/dockerized-magento-nginx https://hub.docker.com/r/andreaskoch/dockerized-magento-php https://hub.docker.com/r/andreaskoch/dockerized-magento-solr This will reduce the initial setup time dramatically because you will no longer have to build PHP locally. For development you can always switch back to the local docker image defintions. --- README.md | 12 ++++++------ docker-compose.yml | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 08e0626a..fb1ad44b 100644 --- a/README.md +++ b/README.md @@ -123,12 +123,12 @@ You can control the project using the built-in `magento`-script which is basical The dockerized Magento project consists of the following components: - **[docker images](docker-images)** - 1. a [php 5.5](docker-images/php/5.5/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 an [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) + 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) - a **[shell script](magento)** for controlling the project: [`./magento `](magento) - a [composer-file](composer.json) for managing the **Magento modules** - and the [docker-compose.yml](docker-compose.yml)-file which connects all components diff --git a/docker-compose.yml b/docker-compose.yml index 9b382fce..deb0fde8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,5 @@ installer: - build: docker-images/installer + image: andreaskoch/dockerized-magento-installer environment: DOMAIN: dockerized-magento.local MAGENTO_ROOT: /var/www/html/web @@ -40,7 +40,7 @@ nginx: volumes_from: - php php: - build: docker-images/php + image: andreaskoch/dockerized-magento-php links: - "cache:rediscache" - "sessions:redissession" @@ -58,7 +58,7 @@ mysql: volumes: - ./data/mysql:/var/lib/mysql solr: - build: docker-images/solr + image: andreaskoch/dockerized-magento-solr cache: image: redis:latest fullpagecache: From 757de6a05e2ae820a70648874efae328edfd6daf Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Thu, 13 Oct 2016 22:56:19 +0200 Subject: [PATCH 03/12] Move the installer cofing to the config folder --- .../installer/bin/install.sh | 4 ++++ .../installer/bin/substitute-env-vars.sh | 0 .../installer/magento/fpc.xml.tmpl | 0 .../installer/magento/local.xml.tmpl | 0 .../installer/magerun/n98-magerun.yaml.tmpl | 0 .../installer/php/php.ini | 0 docker-compose.yml | 9 ++++++++ docker-images/installer/Dockerfile | 21 ------------------- 8 files changed, 13 insertions(+), 21 deletions(-) rename {docker-images => config}/installer/bin/install.sh (95%) mode change 100644 => 100755 rename {docker-images => config}/installer/bin/substitute-env-vars.sh (100%) rename {docker-images => config}/installer/magento/fpc.xml.tmpl (100%) rename {docker-images => config}/installer/magento/local.xml.tmpl (100%) rename {docker-images => config}/installer/magerun/n98-magerun.yaml.tmpl (100%) rename {docker-images => config}/installer/php/php.ini (100%) diff --git a/docker-images/installer/bin/install.sh b/config/installer/bin/install.sh old mode 100644 new mode 100755 similarity index 95% rename from docker-images/installer/bin/install.sh rename to config/installer/bin/install.sh index 9b83cc81..dc27ab6b --- a/docker-images/installer/bin/install.sh +++ b/config/installer/bin/install.sh @@ -56,6 +56,10 @@ function runForever() { done } +# Fix the www-folder permissions +chgrp -R 33 /var/www/html +chmod g+w /var/www/html/web/var /var/www/html/web/app/etc /var/www/html/web/media + # Check if the MAGENTO_ROOT direcotry has been specified if [ -z "$MAGENTO_ROOT" ] then diff --git a/docker-images/installer/bin/substitute-env-vars.sh b/config/installer/bin/substitute-env-vars.sh similarity index 100% rename from docker-images/installer/bin/substitute-env-vars.sh rename to config/installer/bin/substitute-env-vars.sh diff --git a/docker-images/installer/magento/fpc.xml.tmpl b/config/installer/magento/fpc.xml.tmpl similarity index 100% rename from docker-images/installer/magento/fpc.xml.tmpl rename to config/installer/magento/fpc.xml.tmpl diff --git a/docker-images/installer/magento/local.xml.tmpl b/config/installer/magento/local.xml.tmpl similarity index 100% rename from docker-images/installer/magento/local.xml.tmpl rename to config/installer/magento/local.xml.tmpl diff --git a/docker-images/installer/magerun/n98-magerun.yaml.tmpl b/config/installer/magerun/n98-magerun.yaml.tmpl similarity index 100% rename from docker-images/installer/magerun/n98-magerun.yaml.tmpl rename to config/installer/magerun/n98-magerun.yaml.tmpl diff --git a/docker-images/installer/php/php.ini b/config/installer/php/php.ini similarity index 100% rename from docker-images/installer/php/php.ini rename to config/installer/php/php.ini diff --git a/docker-compose.yml b/docker-compose.yml index deb0fde8..8e2fb667 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,12 +16,21 @@ installer: ENCRYPTIONKEY: 731aea833710535779fe8c7c49bc6c4d volumes_from: - nginx + volumes: + - ./config/installer/php/php.ini:/usr/local/etc/php/php.ini + - ./config/installer/magerun/n98-magerun.yaml.tmpl:/etc/n98-magerun.yaml.tmpl + - ./config/installer/magento/local.xml.tmpl:/etc/local.xml.tmpl + - ./config/installer/magento/fpc.xml.tmpl:/etc/fpc.xml.tmpl + - ./config/installer/bin/substitute-env-vars.sh:/bin/substitute-env-vars.sh + - ./config/installer/bin/install.sh:/bin/install.sh links: - "cache:rediscache" - "sessions:redissession" - "fullpagecache:redisfullpagecache" - "solr:solr" - "mysql:mysql" + entrypoint: /bin/install.sh + nginx: image: nginx:latest ports: diff --git a/docker-images/installer/Dockerfile b/docker-images/installer/Dockerfile index ab1babcb..e76d6f01 100644 --- a/docker-images/installer/Dockerfile +++ b/docker-images/installer/Dockerfile @@ -22,10 +22,6 @@ RUN buildDeps=" \ zip \ && apt-get purge -y --auto-remove -COPY php/php.ini /usr/local/etc/php/php.ini - -ENV INSTALLER_VERSION 1.0.0 - # Install Tools RUN apt-get update && \ apt-get install -y \ @@ -36,14 +32,6 @@ RUN apt-get update && \ zip && \ apt-get purge -y --auto-remove -# Add utility scripts -COPY bin/substitute-env-vars.sh /bin/substitute-env-vars.sh -RUN chmod +x /bin/substitute-env-vars.sh - -# Add the Installer -COPY bin/install.sh /bin/install.sh -RUN chmod +x /bin/install.sh - # Install magerun RUN curl -o magerun https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar && \ chmod +x ./magerun && \ @@ -53,14 +41,5 @@ RUN curl -o magerun https://raw.githubusercontent.com/netz98/n98-magerun/master/ apt-get install -qy mysql-client && \ apt-get purge -y --auto-remove -# Add a custom magerun configuration -COPY magerun/n98-magerun.yaml.tmpl /etc/n98-magerun.yaml.tmpl - -# Add custom Magento configuration files -COPY magento/local.xml.tmpl /etc/local.xml.tmpl -COPY magento/fpc.xml.tmpl /etc/fpc.xml.tmpl - # Install composer RUN curl -sS https://getcomposer.org/installer | php -- --filename=composer --install-dir=bin - -ENTRYPOINT ["/bin/install.sh"] \ No newline at end of file From 1673ff5acedd261ad5278644e42dbffa1ee7f873 Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Thu, 13 Oct 2016 23:31:24 +0200 Subject: [PATCH 04/12] Fix installer by setting the correct group permissions ... and exit on error --- config/installer/bin/install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/installer/bin/install.sh b/config/installer/bin/install.sh index dc27ab6b..5e1037ea 100755 --- a/config/installer/bin/install.sh +++ b/config/installer/bin/install.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + ##################################### # Update the Magento Installation # Arguments: @@ -58,7 +60,6 @@ function runForever() { # Fix the www-folder permissions chgrp -R 33 /var/www/html -chmod g+w /var/www/html/web/var /var/www/html/web/app/etc /var/www/html/web/media # Check if the MAGENTO_ROOT direcotry has been specified if [ -z "$MAGENTO_ROOT" ] @@ -103,11 +104,13 @@ substitute-env-vars.sh /etc /etc/fpc.xml.tmpl echo "Overriding Magento Configuration" cp -v /etc/local.xml /var/www/html/web/app/etc/local.xml cp -v /etc/fpc.xml /var/www/html/web/app/etc/fpc.xml +chgrp -R 33 $MAGENTO_ROOT/app/etc echo "Installing Sample Data: Media" curl -s -L https://raw.githubusercontent.com/Vinai/compressed-magento-sample-data/1.9.1.0/compressed-no-mp3-magento-sample-data-1.9.1.0.tgz | tar xz -C /tmp cp -av /tmp/magento-sample-data-*/* $MAGENTO_ROOT rm -rf /tmp/magento-sample-data-* +chgrp -R 33 $MAGENTO_ROOT echo "Installing Sample Data: Database" magerun --skip-root-check --root-dir="$MAGENTO_ROOT" db:create From f59fb1474023fa93d79fdcb8e88b5430724b61e5 Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Thu, 13 Oct 2016 23:33:43 +0200 Subject: [PATCH 05/12] Fix the Magento core installation Use aydin-hassan's magento-composer-installer instead of the magento-hackathons' The old magento-hackathon installer failed. see: https://github.com/AydinHassan/magento-core-composer-installer --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d3c16316..034fba0b 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,9 @@ "aschroder/smtp_pro": "v2.0.5", "gordonlesti/lesti_fpc": "1.3.6", "jeroenvermeulen/solarium": "v1.6.9-beta", - "magento-hackathon/magento-composer-installer": "3.0.6", + "aydin-hassan/magento-core-composer-installer": "*", + "colinmollenhour/modman": "*", + "theseer/autoload": "*", "magento/core": "1.9.2.4" }, "require-dev": { From 572e251d6494899a86d7c57014be65d94fa8e6ff Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Thu, 13 Oct 2016 23:41:16 +0200 Subject: [PATCH 06/12] Keep watching the docker logs after magento start Add a -f flag to the the start action of the magento script. Newer versions of docker-compose will stop showing logs too early. --- magento | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magento b/magento index ea4fcd89..f982a606 100755 --- a/magento +++ b/magento @@ -134,7 +134,7 @@ enterContainer() { } start() { - $DOCKERCOMPOSE up -d && $DOCKERCOMPOSE logs + $DOCKERCOMPOSE up -d && $DOCKERCOMPOSE logs -f } stop() { From 71938bd304dd8857df684e9cb55673ee8d1730b4 Mon Sep 17 00:00:00 2001 From: Volker Thiel Date: Wed, 26 Oct 2016 12:46:12 +0200 Subject: [PATCH 07/12] Updated dependencies --- composer.json | 12 ++++++------ docker-images/installer/Dockerfile | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 034fba0b..b6d640d4 100644 --- a/composer.json +++ b/composer.json @@ -4,19 +4,19 @@ "license": "BSD-3-Clause", "homepage": "https://github.com/andreaskoch/dockerized-magento", "require": { - "aoepeople/aoe_scheduler": "v0.4.3", - "aschroder/smtp_pro": "v2.0.5", - "gordonlesti/lesti_fpc": "1.3.6", + "aoepeople/aoe_scheduler": "^1", + "aschroder/smtp_pro": "^2", + "gordonlesti/lesti_fpc": "^1", "jeroenvermeulen/solarium": "v1.6.9-beta", "aydin-hassan/magento-core-composer-installer": "*", "colinmollenhour/modman": "*", "theseer/autoload": "*", - "magento/core": "1.9.2.4" + "magento/core": "^1.9" }, "require-dev": { "aoepeople/aoe_profiler": "v0.3.0", - "aoepeople/aoe_templatehints": "v0.4.1", - "avstudnitz/scopehint": "dev-master#9fd3eb0978fa67b55f5756494569746119f3f2f6", + "aoepeople/aoe_templatehints": "^0.4", + "avstudnitz/scopehint": "^0.6", "tim-reynolds/magento-qconfig": "1.0" }, "repositories": [ diff --git a/docker-images/installer/Dockerfile b/docker-images/installer/Dockerfile index e76d6f01..8fadffd9 100644 --- a/docker-images/installer/Dockerfile +++ b/docker-images/installer/Dockerfile @@ -35,6 +35,7 @@ RUN apt-get update && \ # Install magerun RUN curl -o magerun https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar && \ chmod +x ./magerun && \ + ./magerun selfupdate && \ cp ./magerun /usr/local/bin/ && \ rm ./magerun && \ apt-get update && \ From 7f671386f362b943c2dae5aa85c508ffe0cac359 Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Wed, 9 Nov 2016 20:20:58 +0100 Subject: [PATCH 08/12] Allow access to the Magento Connect Manager Access to the /downloader route was previously disabled because I never used that feature. This closes andreaskoch/dockerized-magento#29 --- CHANGELOG.md | 9 +++++++++ config/nginx/sites-enabled/default.conf | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..3befb216 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# Change Log +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] +### Changed +- Allow access to the Magento Connect Manager (see issue #29) diff --git a/config/nginx/sites-enabled/default.conf b/config/nginx/sites-enabled/default.conf index acfc6abe..6b967d2a 100644 --- a/config/nginx/sites-enabled/default.conf +++ b/config/nginx/sites-enabled/default.conf @@ -28,7 +28,6 @@ server { location ^~ /pkginfo/ { deny all; } location ^~ /report/config.xml { deny all; } location ^~ /var/ { deny all; } - location ^~ /downloader/ { deny all; } location /var/export/ { deny all; } # Custom Locations From bb2581374fbcb91af089247d47a9d4e7c6fb8140 Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Wed, 9 Nov 2016 20:25:17 +0100 Subject: [PATCH 09/12] Update the changelog for v0.11.0 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3befb216..dafc1c87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ 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] +## [v0.11.0] - 2016-11-09 + ### Changed - Allow access to the Magento Connect Manager (see issue #29) From b2a6d977963a6ae94bbc773fdf7a859d4ba18167 Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Wed, 9 Nov 2016 20:50:52 +0100 Subject: [PATCH 10/12] Move scope-hint and qconfig to the normal requirements These modules are also useful during production. see pull request #27 by @riker09 --- CHANGELOG.md | 1 + composer.json | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dafc1c87..28e825a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,3 +8,4 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### 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) diff --git a/composer.json b/composer.json index b6d640d4..be4e7622 100644 --- a/composer.json +++ b/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": [ { From 119b7e366ea5e2975cd58fca3767c2c1e3daca88 Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Wed, 9 Nov 2016 21:57:55 +0100 Subject: [PATCH 11/12] Add a phpMyAdmin container You can now access the database via phpMyAdmin on port 8080 with the credentials you find in the docker-compose.yml Closes issue andreaskoch/dockerized-magento#18 --- CHANGELOG.md | 6 ++++++ README.md | 21 ++++++++++++++------- config/installer/bin/install.sh | 8 +++++++- docker-compose.yml | 9 +++++++++ 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28e825a7..e6258fa0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ 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 + ## [v0.11.0] - 2016-11-09 ### Changed diff --git a/README.md b/README.md index fb1ad44b..98221a6d 100644 --- a/README.md +++ b/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 `](magento) - a [composer-file](composer.json) for managing the **Magento modules** - and the [docker-compose.yml](docker-compose.yml)-file which connects all components diff --git a/config/installer/bin/install.sh b/config/installer/bin/install.sh index 5e1037ea..13f875ea 100755 --- a/config/installer/bin/install.sh +++ b/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" } diff --git a/docker-compose.yml b/docker-compose.yml index 8e2fb667..ce1b1707 100644 --- a/docker-compose.yml +++ b/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 From 4431dd159e7e3e8ba8793f9c1afa636e4eaaba9f Mon Sep 17 00:00:00 2001 From: Andreas Koch Date: Wed, 9 Nov 2016 22:02:55 +0100 Subject: [PATCH 12/12] Update the changelog for v0.12.0 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6258fa0..3040c8e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### 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