Commit 57010c0

authored

Merge pull request #2514 from jenssegers/improve-docker

chore: improve docker tests

2 parents 7dab675 + c380ce3 commit 57010c0Copy full SHA for 57010c0

File tree

+19

-13

lines changed

+19

-13

lines changed

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`		`-ARG PHP_VERSION=8.0`
`2`		`-ARG COMPOSER_VERSION=2.0`
	`1`	`+ARG PHP_VERSION=8.1`
	`2`	`+ARG COMPOSER_VERSION=2.5.4`
`3`	`3`
`4`		`-FROM composer:${COMPOSER_VERSION}`
`5`	`4`	`FROM php:${PHP_VERSION}-cli`
`6`	`5`
`7`	`6`	`RUN apt-get update && \`
`@@ -10,6 +9,16 @@ RUN apt-get update && \`
`10`	`9`	`pecl install xdebug && docker-php-ext-enable xdebug && \`
`11`	`10`	`docker-php-ext-install -j$(nproc) pdo_mysql zip`
`12`	`11`
`13`		`-COPY --from=composer /usr/bin/composer /usr/local/bin/composer`
	`12`	`+COPY --from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/local/bin/composer`
`14`	`13`
`15`	`14`	`WORKDIR /code`
	`15`	`+`
	`16`	`+COPY composer.* ./`
	`17`	`+`
	`18`	`+RUN composer install`
	`19`	`+`
	`20`	`+COPY ./ ./`
	`21`	`+`
	`22`	`+RUN composer install`
	`23`	`+`
	`24`	`+CMD ["./vendor/bin/phpunit"]`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ version: '3'`
`3`	`3`	`services:`
`4`	`4`	`tests:`
`5`	`5`	`container_name: tests`
	`6`	`+ tty: true`
`6`	`7`	`build:`
`7`	`8`	`context: .`
`8`	`9`	`dockerfile: Dockerfile`
`@@ -15,20 +16,16 @@ services:`
`15`	`16`
`16`	`17`	`mysql:`
`17`	`18`	`container_name: mysql`
`18`		`- image: mysql:5.7`
	`19`	`+ image: mysql:8.0`
`19`	`20`	`ports:`
`20`		`- - 3306:3306`
	`21`	`+ - "3306:3306"`
`21`	`22`	`environment:`
`22`	`23`	`MYSQL_ROOT_PASSWORD:`
`23`	`24`	`MYSQL_DATABASE: unittest`
`24`	`25`	`MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'`
`25`		`- logging:`
`26`		`- driver: none`
`27`	`26`
`28`	`27`	`mongodb:`
`29`	`28`	`container_name: mongodb`
`30`		`- image: mongo`
	`29`	`+ image: mongo:latest`
`31`	`30`	`ports:`
`32`		`- - 27017:27017`
`33`		`- logging:`
`34`		`- driver: none`
	`31`	`+ - "27017:27017"`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@`
`38`	`38`	`</testsuite>`
`39`	`39`	`</testsuites>`
`40`	`40`	`<php>`
`41`		`- <env name="MONGODB_URI" value="mongodb://127.0.0.1/" />`
	`41`	`+ <env name="MONGODB_URI" value="mongodb://mongodb/" />`
`42`	`42`	`<env name="MONGODB_DATABASE" value="unittest"/>`
`43`	`43`	`<env name="MYSQL_HOST" value="mysql"/>`
`44`	`44`	`<env name="MYSQL_PORT" value="3306"/>`

Comments

(0)