Merge pull request #18 from openeuropa/OPENEUROPA-582

OPENEUROPA-582: Update images on docker-compose and drone file.

.drone.yml

@@ -4,44 +4,36 @@ workspace:
 
 services:
   web:
-    image: fpfis/php71-build:latest
+    image: fpfis/httpd-php-dev:7.1
     environment:
       - DOCUMENT_ROOT=/test/oe_paragraphs
   mysql:
     image: percona/percona-server:5.6
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
 
-matrix:
-  DRUPAL_VERSION:
-    - 8.6.x
-
 pipeline:
   composer-install:
     group: prepare
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     volumes:
       - /cache:/cache
     commands:
-      - composer require --dev webflo/drupal-core-require-dev:${DRUPAL_VERSION=8.6.x}
+      - composer install
 
   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
-      # Reset permission since installation runs as root. @todo Fix this.
-      - chown -R 1000:1000 build/sites/default
-      - chmod -R 777 /tmp
 
   grumphp:
     group: test
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     commands:
       - ./vendor/bin/grumphp run
 
   behat:
     group: test
-    image: fpfis/php71-build
+    image: fpfis/httpd-php-dev:7.1
     commands:
       - ./vendor/bin/behat

README.md

@@ -62,9 +62,9 @@ $ docker-compose up -d
 Then:
 
 ```
-$ docker-compose exec -u web web composer install
-$ docker-compose exec -u web web ./vendor/bin/run drupal:site-setup
-$ docker-compose exec -u web web ./vendor/bin/run drupal:site-install
+$ docker-compose exec web composer install
+$ docker-compose exec web ./vendor/bin/run drupal:site-setup
+$ docker-compose exec web ./vendor/bin/run drupal:site-install
 ```
 
 Your test site will be available at
@@ -73,5 +73,5 @@ Your test site will be available at
 To run the Behat test:
 
 ```
-$ docker-compose exec -u web web ./vendor/bin/behat
+$ docker-compose exec web ./vendor/bin/behat
 ```

composer.json

@@ -33,7 +33,7 @@
         "composer-exit-on-patch-failure": true,
         "patches": {
             "drupal/core": {
-                "https://www.drupal.org/project/drupal/issues/2599228": "https://www.drupal.org/files/issues/2599228-31-tests-only.patch"
+                "https://www.drupal.org/project/drupal/issues/2599228": "https://www.drupal.org/files/issues/2018-05-17/2599228-51.patch"
             }
         },
         "installer-paths": {

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   web:
-    image: fpfis/php71-dev
+    image: fpfis/httpd-php-dev:7.1
     working_dir: /var/www/html
     ports:
       - 8080:8080
@@ -10,8 +10,7 @@ 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"
-      COMPOSER_CACHE_DIR: "/tmp/composer"
-
   mysql:
-    image: fpfis/mysql56
+    image: percona/percona-server:5.6
+    environment:
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"