Remove test-runner service.
This commit is contained in:
parent
36fb1809fc
commit
2bc77bb4b2
|
@ -11,28 +11,3 @@ services:
|
||||||
|
|
||||||
chrome:
|
chrome:
|
||||||
image: selenium/standalone-chrome:latest
|
image: selenium/standalone-chrome:latest
|
||||||
|
|
||||||
# We use a separate test-runner container running the 2.x image so that tests
|
|
||||||
# run without dev dependencies like XDebug, which slow things down.
|
|
||||||
test-runner:
|
|
||||||
depends_on:
|
|
||||||
- www
|
|
||||||
- chrome
|
|
||||||
image: farmos/farmos:2.x
|
|
||||||
entrypoint: /bin/bash
|
|
||||||
command:
|
|
||||||
- -c
|
|
||||||
- |
|
|
||||||
set -e
|
|
||||||
# Wait until the dev farmOS container has finished copying its files
|
|
||||||
until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
|
|
||||||
# Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
|
|
||||||
# file created, allowing the Github action to also wait for the above conditions on the basis
|
|
||||||
# of that file's creation.
|
|
||||||
exec docker-entrypoint.sh apache2-foreground
|
|
||||||
volumes:
|
|
||||||
- './www:/opt/drupal'
|
|
||||||
environment:
|
|
||||||
FARMOS_FS_READY_SENTINEL_FILENAME: /opt/drupal/test-runner-container-fs-ready
|
|
||||||
SIMPLETEST_DB: $DB_URL
|
|
||||||
XDEBUG_MODE: 'off'
|
|
||||||
|
|
|
@ -16,17 +16,3 @@ services:
|
||||||
www:
|
www:
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
|
||||||
test-runner:
|
|
||||||
command:
|
|
||||||
- -c
|
|
||||||
- |
|
|
||||||
set -e
|
|
||||||
# Wait until the dev farmOS container has finished copying its files
|
|
||||||
until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
|
|
||||||
# Wait until mariadb is online listening to its socket
|
|
||||||
while { ! exec 3<>/dev/tcp/db/3306; } > /dev/null 2>&1; do sleep 0.1; done
|
|
||||||
# Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
|
|
||||||
# file created, allowing the Github action to also wait for the above conditions on the basis
|
|
||||||
# of that file's creation.
|
|
||||||
exec docker-entrypoint.sh apache2-foreground
|
|
||||||
|
|
|
@ -15,17 +15,3 @@ services:
|
||||||
www:
|
www:
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
|
|
||||||
test-runner:
|
|
||||||
command:
|
|
||||||
- -c
|
|
||||||
- |
|
|
||||||
set -e
|
|
||||||
# Wait until the dev farmOS container has finished copying its files
|
|
||||||
until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
|
|
||||||
# Wait until Postgres is online listening to its socket
|
|
||||||
while { ! exec 3<>/dev/tcp/db/5432; } > /dev/null 2>&1; do sleep 0.1; done
|
|
||||||
# Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
|
|
||||||
# file created, allowing the Github action to also wait for the above conditions on the basis
|
|
||||||
# of that file's creation.
|
|
||||||
exec docker-entrypoint.sh apache2-foreground
|
|
||||||
|
|
|
@ -1,14 +1,3 @@
|
||||||
# Inherits from docker-compose.testing.common.yml
|
# Inherits from docker-compose.testing.common.yml
|
||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services: { }
|
||||||
test-runner:
|
|
||||||
command:
|
|
||||||
- -c
|
|
||||||
- |
|
|
||||||
set -e
|
|
||||||
# Wait until the dev farmOS container has finished copying its files
|
|
||||||
until [ -f /opt/drupal/www-container-fs-ready ]; do sleep 0.1; done
|
|
||||||
# Run normal entrypoint and apache - only at this point is the test-runner-container-fs-ready
|
|
||||||
# file created, allowing the Github action to also wait for the above conditions on the basis
|
|
||||||
# of that file's creation.
|
|
||||||
exec docker-entrypoint.sh apache2-foreground
|
|
||||||
|
|
Loading…
Reference in New Issue