* Pass WP version to docker-compose as ENV var

* change to 5.3

* rename to WP_VERSION to match unit-tests
This commit is contained in:
Seghir Nadir 2020-06-10 15:55:40 +01:00 committed by GitHub
parent 9b05b19028
commit cadeb15e29
3 changed files with 18 additions and 15 deletions

View File

@ -12,3 +12,4 @@ WORDPRESS_TITLE=WooCommerce Core E2E Test Suite
WORDPRESS_LOGIN=admin
WORDPRESS_PASSWORD=password
WORDPRESS_EMAIL=admin@woocommercecoree2etestsuite.com
WP_VERSION=5.4

View File

@ -1 +1,2 @@
FROM wordpress:5.4
ARG WP_VERSION
FROM wordpress:${WP_VERSION}

View File

@ -1,7 +1,6 @@
version: '3.3'
version: "3.3"
services:
db:
image: mariadb:10.5
restart: on-failure
@ -9,10 +8,10 @@ services:
MYSQL_DATABASE: wordpress
MYSQL_USER: wordpress
MYSQL_PASSWORD: wordpress
MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
MYSQL_RANDOM_ROOT_PASSWORD: "yes"
volumes:
- db:/var/lib/mysql
- db:/var/lib/mysql
wordpress-unit-tests:
container_name: wordpress_test
depends_on:
@ -31,7 +30,7 @@ services:
WP_CORE_DIR: /var/www/html
WP_TESTS_DIR: /tmp/wordpress-tests-lib
volumes:
- './:/var/www/html/wp-content/plugins/woocommerce-gutenberg-products-block'
- "./:/var/www/html/wp-content/plugins/woocommerce-gutenberg-products-block"
- wordpress:/var/www/html
wordpress-www:
@ -39,6 +38,8 @@ services:
- db
build:
context: ./bin/docker/wordpress
args:
WP_VERSION: ${WP_VERSION}
ports:
- ${WORDPRESS_PORT}:80
restart: on-failure
@ -58,16 +59,16 @@ services:
- db
- wordpress-www
build:
context: ./bin/docker/wp-cli
context: ./bin/docker/wp-cli
restart: on-failure
environment:
WORDPRESS_HOST:
WORDPRESS_TITLE:
WORDPRESS_LOGIN:
WORDPRESS_PASSWORD:
WORDPRESS_PORT:
WORDPRESS_EMAIL:
DOMAIN_NAME:
WORDPRESS_HOST:
WORDPRESS_TITLE:
WORDPRESS_LOGIN:
WORDPRESS_PASSWORD:
WORDPRESS_PORT:
WORDPRESS_EMAIL:
DOMAIN_NAME:
volumes:
- ./:/var/www/html/wp-content/plugins/woocommerce-gutenberg-products-block
- wordpress:/var/www/html