Skip to content

Commit

Permalink
OPENEUROPA-582: Update docker images and add docker-compose.yml.
Browse files Browse the repository at this point in the history
  • Loading branch information
voidtek committed Jul 4, 2018
1 parent 25352e2 commit d8b3e3a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
12 changes: 6 additions & 6 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -60,7 +60,7 @@ pipeline:

behat:
group: test
image: fpfis/php71-build
image: fpfis/httpd-php-dev:7.1
commands:
- ./vendor/bin/behat

Expand Down
9 changes: 6 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: ""

0 comments on commit d8b3e3a

Please sign in to comment.