Skip to content

Commit b86a9b8

Browse files
committed
For container-based testing allow to specify a testrunner image, and COMPOSER_ARGS
1 parent a52ccf6 commit b86a9b8

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

.ci/compose.yaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121
- mailhost
2222
- browserhost
2323
hostname: 'testrunner'
24-
image: ghcr.io/roundcube/roundcubemail-testrunner:php8.3
24+
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
2525
volumes:
2626
- '..:/app'
2727
- '../tests/Browser/downloads:/downloads'
@@ -33,13 +33,16 @@ services:
3333
TESTRUNNER_DOWNLOADS_DIR: './tests/Browser/downloads'
3434
RC_CONFIG_IMAP_HOST: 'tls://mailhost:3143'
3535
RC_CONFIG_SMTP_HOST: 'mailhost:3025'
36+
COMPOSER_ARGS: $COMPOSER_ARGS
3637
working_dir: /work
3738
command: '/usr/local/bin/run-in-copy.sh .ci/run_browser_tests.sh'
3839

3940
tests:
4041
depends_on:
4142
- mailhost
42-
image: ghcr.io/roundcube/roundcubemail-testrunner:php8.3
43+
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
44+
environment:
45+
COMPOSER_ARGS: $COMPOSER_ARGS
4346
volumes:
4447
- '..:/app'
4548
working_dir: /work
@@ -48,22 +51,27 @@ services:
4851
test_message_rendering:
4952
depends_on:
5053
- mailhost
51-
image: ghcr.io/roundcube/roundcubemail-testrunner:php8.3
54+
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
5255
environment:
56+
COMPOSER_ARGS: $COMPOSER_ARGS
5357
RC_CONFIG_IMAP_HOST: 'tls://mailhost:3143'
5458
volumes:
5559
- '..:/app'
5660
command:
5761
- .ci/run_test_message_rendering.sh
5862

5963
codespell:
60-
image: ghcr.io/roundcube/roundcubemail-testrunner:php8.3
64+
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
65+
environment:
66+
COMPOSER_ARGS: $COMPOSER_ARGS
6167
volumes:
6268
- '..:/app'
6369
entrypoint: ./.ci/run_php-cs-fixer.sh
6470

6571
codestyle:
66-
image: ghcr.io/roundcube/roundcubemail-testrunner:php8.3
72+
image: ${ROUNDCUBEMAIL_IMAGE_TESTRUNNER:-ghcr.io/roundcube/roundcubemail-testrunner:php8.3}
73+
environment:
74+
COMPOSER_ARGS: $COMPOSER_ARGS
6775
volumes:
6876
- '..:/app'
6977
entrypoint: ./.ci/run_phpstan.sh

0 commit comments

Comments
 (0)