Skip to content

Commit 840bea3

Browse files
committed
move s3 docker file, some fixes for run_test_ci
1 parent 8685e67 commit 840bea3

8 files changed

+17
-53
lines changed

docker/config/materia-docker-test.env.local

-47
This file was deleted.

docker/docker-compose.test.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@ services:
66
volumes:
77
# isolate test widget files just for test
88
- static_widget_files_test:/var/www/html/public/widget
9-
# add docker-specific env.local for test
10-
- ./config/materia-docker-test.env.local:/var/www/html/.env.local:ro
119
# isolate test media just for test
1210
- uploaded_media_test:/var/www/html/fuel/packages/materia/media
11+
environment:
12+
- DATABASE_URL=mysql://${MYSQL_USER}:${MYSQL_PASSWORD}@mysql/test
13+
- FUEL_ENV=test
14+
- FUEL_LOG_THRESHOLD=0
15+
- LOG_HANDLER=DEFAULT
1316
command: echo "yay"
1417

1518
mysql:

docker/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313

1414
set -e
1515

16-
docker-compose run --rm app /wait-for-it.sh mysql:3306 -t 20 -- env COMPOSER_ALLOW_SUPERUSER=1 "$@"
16+
docker-compose run --rm app /wait-for-it.sh mysql:3306 -t 20 -- "$@"

docker/run_tests.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ echo "remember you can limit your test groups with './run_tests.sh --group=Lti'"
88

99
DCTEST="docker-compose -f docker-compose.yml -f docker-compose.test.yml"
1010

11-
$DCTEST run --rm app /wait-for-it.sh mysql:3306 -t 20 -- env COMPOSER_ALLOW_SUPERUSER=1 composer run testci -- "$@"
11+
$DCTEST run --rm app /wait-for-it.sh mysql:3306 -t 20 -- composer run testci -- "$@"

docker/run_tests_ci.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $DCTEST pull --ignore-pull-failures app fakes3
1919
$DCTEST run --rm --no-deps app composer install --no-progress
2020

2121
# run linter
22-
$DCTEST run --rm --no-deps app env COMPOSER_ALLOW_SUPERUSER=1 composer sniff-ci
22+
$DCTEST run --rm --no-deps app composer sniff-ci
2323

2424
# install widgets and run tests
2525
source run_tests_coverage.sh

docker/run_tests_coverage.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ echo "If you have an issue with a broken widget, clear the widgets with:"
2020
echo "$DCTEST run --rm app bash -c -e 'rm /var/www/html/fuel/packages/materia/vendor/widget/test/*'"
2121

2222
# store the docker compose command to shorten the following commands
23-
$DCTEST run --rm app /wait-for-it.sh mysql:3306 -t 20 -- env COMPOSER_ALLOW_SUPERUSER=1 composer run coverageci -- "$@"
23+
$DCTEST run --rm app /wait-for-it.sh mysql:3306 -t 20 -- composer run coverageci -- "$@"
File renamed without changes.
+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.git
2+
.github
3+
fuel
4+
githooks
5+
licenses
6+
node_modules
7+
public
8+
src

0 commit comments

Comments
 (0)