OPENEUROPA-582: Update docker images and add docker-compose.yml.

openeuropa · Jul 4, 2018 · fe99b3d · fe99b3d
1 parent 25352e2
commit fe99b3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git 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,39 +28,33 @@ 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
-      - chown -R 1000:1000 build/sites/default
-      - chown -R 1000:1000 build/sites/simpletest
-      - chmod -R 777 /tmp
-      - useradd -u 1000 -m -s /bin/bash web
-      - su web -c"./vendor/bin/phpunit"
+      - ./vendor/bin/phpunit
 
   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
@@ -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,8 @@ 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"