Skip to content

Commit d62d684

Browse files
authored
Merge pull request #7 from kool-dev/fix-default-vendor
Updates to vendor
2 parents 8080043 + 3310cc5 commit d62d684

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

laravel/gitlab/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ <h3>GitLab CI/CD configuration for a Laravel application running with Kool.dev</
106106

107107
<div style="margin: 1em 5em; padding: 1em;" class="bg-dark">
108108
<pre class="text-light">
109-
phpqa: kool docker jakzal/phpqa:1.17.0-php7.2-alpine
109+
phpqa: kool docker jakzal/phpqa:php7.4-alpine
110110
# helpful to sync up service dependencies
111111
wait-services: kool exec app dockerize -wait tcp://database:3306 -wait tcp://cache:6379 -timeout 30s
112112

laravel/gitlab/vendor.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
variables:
2+
# .env.xxx file that should be used as .env
3+
# before composer install.
4+
VENDOR_ENV_FILE: .env.testing
5+
16
.vendor:
27
image: kooldev/kool:1.0
38
services:
@@ -10,7 +15,7 @@
1015
paths:
1116
- vendor/
1217
before_script:
13-
- cp .env.testing .env
18+
- if [ -f $VENDOR_ENV_FILE ]; then cp $VENDOR_ENV_FILE .env; fi
1419
- kool start
1520
script:
1621
- kool run composer install --prefer-dist --no-progress --no-suggest --no-interaction -v --optimize-autoloader

0 commit comments

Comments
 (0)