From d8b3e3a9a14d567166060930f7b4b09b26e32928 Mon Sep 17 00:00:00 2001
From: voidtek <vdacosta@voidtek.com>
Date: Wed, 4 Jul 2018 13:55:33 +0000
Subject: [PATCH] OPENEUROPA-582: Update docker images and add
 docker-compose.yml.

---
 .drone.yml         | 12 ++++++------
 docker-compose.yml |  9 ++++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8a5d4ec..37f20d2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ workspace:
 
 services:
   web:
-    image: fpfis/php71-build:latest
+    image: fpfis/httpd-php-dev:7.1
     environment:
       - DOCUMENT_ROOT=/test/drupal-module-template
   mysql:
@@ -28,27 +28,27 @@ services:
 pipeline:
   composer-install:
     group: prepare
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     volumes:
       - /cache:/cache
     commands:
       - composer require drupal/core:${DRUPAL_VERSION=8.6.x}
 
   site-install:
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     commands:
       - ./vendor/bin/run drupal:site-setup
       - ./vendor/bin/run drupal:site-install
 
   grumphp:
     group: test
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     commands:
       - ./vendor/bin/grumphp run
 
   phpunit:
     group: test
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     commands:
       # Reset permission since installation runs as root. @todo Fix this.
       - mkdir -p build/sites/simpletest
@@ -60,7 +60,7 @@ pipeline:
 
   behat:
     group: test
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     commands:
       - ./vendor/bin/behat
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 91204d0..49bdc9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
 
   web:
-    image: fpfis/php71-dev
+    image: fpfis/httpd-php-dev:7.1
     working_dir: /var/www/html
     ports:
       - 8080:8080
@@ -11,7 +11,10 @@ services:
     environment:
       XDEBUG_CONFIG: "remote_enable=1 remote_host=${DOCKER_HOST_IP} remote_port=9000 idekey=PHPSTORM remote_autostart=1"
       PHP_IDE_CONFIG: "serverName=Test"
-      COMPOSER_MEMORY_LIMIT: "2G"
 
   mysql:
-    image: fpfis/mysql56
+    image: percona/percona-server:5.6
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+      MYSQL_DATABASE: "drupal_module_template"
+      MYSQL_ROOT_PASSWORD: ""