Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Rename docker-compose to docker compose

Browse Source 
[MAILPOET-6233]
This commit is contained in:
Pavel Dohnal
2024-09-17 11:29:07 +02:00
committed by Jan Lysý
parent 0efe8e0204
commit 1a0fecf2db
7 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
.circleci/config.yml
View File

@ -445,19 +445,19 @@ jobs:
- run: - run:
name: 'Pull test docker images' name: 'Pull test docker images'
# Pull docker images with 3 retries # Pull docker images with 3 retries
command: i='0';while ! docker-compose -f ../tests_env/docker/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done command: i='0';while ! docker compose -f ../tests_env/docker/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done
- run: - run:
name: Create docker containers for test name: Create docker containers for test
# We experienced some failures when creating containers so we do it explicitly with one retry # We experienced some failures when creating containers so we do it explicitly with one retry
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose create || docker-compose create docker compose create || docker compose create
- run: - run:
# Some tools we use may need different version based on PHP version used in docker # Some tools we use may need different version based on PHP version used in docker
name: Ensure correct versions of tools name: Ensure correct versions of tools
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project -e COMPOSER_DEV_MODE=1 --entrypoint "php tools/install.php" codeception_acceptance docker compose run --rm -w /project -e COMPOSER_DEV_MODE=1 --entrypoint "php tools/install.php" codeception_acceptance
- when: - when:
condition: ${WOOCOMMERCE_VERSION} condition: ${WOOCOMMERCE_VERSION}
steps: steps:
@ -465,7 +465,7 @@ jobs:
name: Download WooCommerce Core name: Download WooCommerce Core
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
- when: - when:
condition: << parameters.woo_subscriptions_version >> condition: << parameters.woo_subscriptions_version >>
steps: steps:
@ -473,7 +473,7 @@ jobs:
name: Download WooCommerce Subscriptions name: Download WooCommerce Subscriptions
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
- when: - when:
condition: << parameters.woo_memberships_version >> condition: << parameters.woo_memberships_version >>
steps: steps:
@ -481,7 +481,7 @@ jobs:
name: Download WooCommerce Memberships name: Download WooCommerce Memberships
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-memberships-zip << parameters.woo_memberships_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-memberships-zip << parameters.woo_memberships_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
- when: - when:
condition: << parameters.automate_woo_version >> condition: << parameters.automate_woo_version >>
steps: steps:
@ -489,7 +489,7 @@ jobs:
name: Download AutomateWoo name: Download AutomateWoo
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance docker compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_acceptance
- run: - run:
name: Group acceptance tests name: Group acceptance tests
command: | command: |
@ -518,7 +518,7 @@ jobs:
--xml --xml
-g circleci_split_group -g circleci_split_group
) )
docker-compose run -e SKIP_DEPS=1 \ docker compose run -e SKIP_DEPS=1 \
-e CIRCLE_BRANCH=${CIRCLE_BRANCH} \ -e CIRCLE_BRANCH=${CIRCLE_BRANCH} \
-e CIRCLE_JOB=${CIRCLE_JOB} \ -e CIRCLE_JOB=${CIRCLE_JOB} \
-e MULTISITE=<< parameters.multisite >> \ -e MULTISITE=<< parameters.multisite >> \
@ -577,13 +577,13 @@ jobs:
- run: - run:
name: 'Pull test docker images' name: 'Pull test docker images'
# Pull docker images with 3 retries # Pull docker images with 3 retries
command: i='0';while ! docker-compose -f tests/performance/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done command: i='0';while ! docker compose -f tests/performance/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done
- run: - run:
name: Create docker containers for test name: Create docker containers for test
# We experienced some failures when creating containers so we do it explicitly with one retry # We experienced some failures when creating containers so we do it explicitly with one retry
command: | command: |
cd tests/performance cd tests/performance
docker-compose create || docker-compose create docker compose create || docker compose create
- run: - run:
name: Run performance tests name: Run performance tests
command: | command: |
@ -741,19 +741,19 @@ jobs:
- run: - run:
name: 'Pull test docker images' name: 'Pull test docker images'
# Pull docker images with 3 retries # Pull docker images with 3 retries
command: i='0';while ! docker-compose -f ../tests_env/docker/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done command: i='0';while ! docker compose -f ../tests_env/docker/docker-compose.yml pull && ((i < 3)); do sleep 3 && i=$[$i+1]; done
- run: - run:
name: Create docker containers for test name: Create docker containers for test
# We experienced some failures when creating containers so we do it explicitly with one retry # We experienced some failures when creating containers so we do it explicitly with one retry
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose create || docker-compose create docker compose create || docker compose create
- run: - run:
# Some tools we use may need different version based on PHP version used in docker # Some tools we use may need different version based on PHP version used in docker
name: Ensure correct versions of tools name: Ensure correct versions of tools
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project -e COMPOSER_DEV_MODE=1 --entrypoint "php tools/install.php" codeception_integration docker compose run --rm -w /project -e COMPOSER_DEV_MODE=1 --entrypoint "php tools/install.php" codeception_integration
- when: - when:
condition: ${WOOCOMMERCE_VERSION} condition: ${WOOCOMMERCE_VERSION}
steps: steps:
@ -761,7 +761,7 @@ jobs:
name: Download WooCommerce Core name: Download WooCommerce Core
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-zip ${WOOCOMMERCE_VERSION}" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
- when: - when:
condition: << parameters.woo_subscriptions_version >> condition: << parameters.woo_subscriptions_version >>
steps: steps:
@ -769,7 +769,7 @@ jobs:
name: Download WooCommerce Subscriptions name: Download WooCommerce Subscriptions
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-subscriptions-zip << parameters.woo_subscriptions_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
- when: - when:
condition: << parameters.woo_memberships_version >> condition: << parameters.woo_memberships_version >>
steps: steps:
@ -777,7 +777,7 @@ jobs:
name: Download WooCommerce Memberships name: Download WooCommerce Memberships
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:woo-commerce-memberships-zip << parameters.woo_memberships_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration docker compose run --rm -w /project --entrypoint "./do download:woo-commerce-memberships-zip << parameters.woo_memberships_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
- when: - when:
condition: << parameters.automate_woo_version >> condition: << parameters.automate_woo_version >>
steps: steps:
@ -785,7 +785,7 @@ jobs:
name: Download AutomateWoo name: Download AutomateWoo
command: | command: |
cd ../tests_env/docker cd ../tests_env/docker
docker-compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration docker compose run --rm -w /project --entrypoint "./do download:automate-woo-zip << parameters.automate_woo_version >>" --no-deps -e WP_GITHUB_USERNAME=${WP_GITHUB_USERNAME} -e WP_GITHUB_TOKEN=${WP_GITHUB_TOKEN} codeception_integration
- run: - run:
name: 'PHP Integration tests' name: 'PHP Integration tests'
command: | command: |
@ -804,7 +804,7 @@ jobs:
if [[ -n '<< parameters.skip_group >>' ]]; then if [[ -n '<< parameters.skip_group >>' ]]; then
args+=(--skip-group << parameters.skip_group >>) args+=(--skip-group << parameters.skip_group >>)
fi fi
docker-compose run -e SKIP_DEPS=1 \ docker compose run -e SKIP_DEPS=1 \
-e CIRCLE_BRANCH=${CIRCLE_BRANCH} \ -e CIRCLE_BRANCH=${CIRCLE_BRANCH} \
-e CIRCLE_JOB=${CIRCLE_JOB} \ -e CIRCLE_JOB=${CIRCLE_JOB} \
-e SKIP_PLUGINS=<< parameters.skip_plugins >> \ -e SKIP_PLUGINS=<< parameters.skip_plugins >> \

8
README.md
View File

@ -103,8 +103,8 @@ Then create a Docker Compose override file with NFS settings and restart contain
```shell ```shell
cp docker-compose.override.macos-sample.yml docker-compose.override.yml cp docker-compose.override.macos-sample.yml docker-compose.override.yml
docker-compose down -v --remove-orphans docker compose down -v --remove-orphans
docker-compose up -d docker compose up -d
``` ```
**NOTE:** If you are on MacOS Catalina or newer, make sure to put the repository **NOTE:** If you are on MacOS Catalina or newer, make sure to put the repository
@ -163,10 +163,10 @@ To switch the environment to a different PHP version:
dockerfile: dev/{PHP_VERSION}/Dockerfile dockerfile: dev/{PHP_VERSION}/Dockerfile
``` ```
3. Run `docker-compose build wordpress`. 3. Run `docker compose build wordpress`.
4. Start the stack with `./do start`. 4. Start the stack with `./do start`.
To switch back to the default PHP version remove what was added in 2) and, run `docker-compose build wordpress` for application container and `docker-compose build test_wordpress` for tests container, To switch back to the default PHP version remove what was added in 2) and, run `docker compose build wordpress` for application container and `docker compose build test_wordpress` for tests container,
and start the stack using `./do start`. and start the stack using `./do start`.
### Disabling the Tracy panel ### Disabling the Tracy panel

4
dev/initial-setup.sh
View File

@ -21,7 +21,7 @@ mkdir -p wordpress/wp-content/plugins/mailpoet-premium
mkdir -p dev/data/mailhog mkdir -p dev/data/mailhog
for plugin in "mailpoet" "mailpoet-premium"; do for plugin in "mailpoet" "mailpoet-premium"; do
docker-compose run --rm wordpress /bin/sh -c " docker compose run --rm wordpress /bin/sh -c "
[ -d /var/www/html/wp-content/plugins/$plugin ] && [ -d /var/www/html/wp-content/plugins/$plugin ] &&
cd /var/www/html/wp-content/plugins/$plugin && cd /var/www/html/wp-content/plugins/$plugin &&
./do install && ./do install &&
@ -29,7 +29,7 @@ for plugin in "mailpoet" "mailpoet-premium"; do
" "
done done
docker-compose run --rm wordpress /bin/sh -c " docker compose run --rm wordpress /bin/sh -c "
cd /var/www/templates && cd /var/www/templates &&
mkdir assets classes exported mkdir assets classes exported
" "

4
dev/mac-nfs-setup.sh
View File

@ -29,6 +29,6 @@ cat <<EOT
NFS volume sharing is set up. Recreate your containers and volumes using: NFS volume sharing is set up. Recreate your containers and volumes using:
cp docker-compose.override.macos-sample.yml docker-compose.override.yml cp docker-compose.override.macos-sample.yml docker-compose.override.yml
docker-compose down -v --remove-orphans docker compose down -v --remove-orphans
docker-compose up -d docker compose up -d
EOT EOT

16
do
View File

@ -3,8 +3,8 @@
function syntax { function syntax {
cat << EOF cat << EOF
./do setup Setup the dev environment. ./do setup Setup the dev environment.
./do start Start the docker containers (docker-compose up -d). ./do start Start the docker containers (docker compose up -d).
./do stop Stop the docker containers (docker-compose stop). ./do stop Stop the docker containers (docker compose stop).
./do ssh [--test] Run an interactive bash shell inside the plugin directory. ./do ssh [--test] Run an interactive bash shell inside the plugin directory.
./do run [--test] <command> Run a custom bash command in the wordpress container. ./do run [--test] <command> Run a custom bash command in the wordpress container.
./do acceptance [--premium] Run acceptance tests. ./do acceptance [--premium] Run acceptance tests.
@ -21,7 +21,7 @@ EOF
function ssh_and_run { function ssh_and_run {
params=("$@") params=("$@")
params=("${params[@]:1}") params=("${params[@]:1}")
docker-compose exec $1 bash -c "${params[@]}" docker compose exec $1 bash -c "${params[@]}"
} }
if [ "$1" = "" -o "$1" = "--help" ]; then if [ "$1" = "" -o "$1" = "--help" ]; then
@ -31,10 +31,10 @@ elif [ "$1" = "setup" ]; then
./dev/initial-setup.sh ./dev/initial-setup.sh
elif [ "$1" = "start" ]; then elif [ "$1" = "start" ]; then
docker-compose up -d docker compose up -d
elif [ "$1" = "stop" ]; then elif [ "$1" = "stop" ]; then
docker-compose stop docker compose stop
elif [ "$1" = "run" ]; then elif [ "$1" = "run" ]; then
params=("$@") params=("$@")
@ -54,9 +54,9 @@ elif [ "$1" = "ssh" ]; then
fi fi
if [ "$2" = "--test" ] || [ "$3" = "--test" ]; then if [ "$2" = "--test" ] || [ "$3" = "--test" ]; then
docker-compose exec --workdir $dir test_wordpress bash docker compose exec --workdir $dir test_wordpress bash
else else
docker-compose exec --workdir $dir wordpress bash docker compose exec --workdir $dir wordpress bash
fi fi
elif [ "$1" = "acceptance" ]; then elif [ "$1" = "acceptance" ]; then
@ -65,7 +65,7 @@ elif [ "$1" = "acceptance" ]; then
else else
cd mailpoet cd mailpoet
fi fi
COMPOSE_HTTP_TIMEOUT=200 docker-compose run codeception_acceptance -e KEEP_DEPS=1 --steps --debug -vvv COMPOSE_HTTP_TIMEOUT=200 docker compose run codeception_acceptance -e KEEP_DEPS=1 --steps --debug -vvv
cd .. cd ..
elif [ "$1" = "build" ]; then elif [ "$1" = "build" ]; then

10
mailpoet/RoboFile.php
View File

@ -473,14 +473,14 @@ class RoboFile extends \Robo\Tasks {
// import data & run WordPress setup // import data & run WordPress setup
$this->say('Importing data and running a WordPress setup...'); $this->say('Importing data and running a WordPress setup...');
$this->taskExec('COMPOSE_HTTP_TIMEOUT=200 docker-compose run --rm -it setup') $this->taskExec('COMPOSE_HTTP_TIMEOUT=200 docker compose run --rm -it setup')
->dir(__DIR__ . '/tests/performance') ->dir(__DIR__ . '/tests/performance')
->run(); ->run();
$this->say('Data imported, WordPress set up.'); $this->say('Data imported, WordPress set up.');
} }
public function testPerformanceClean() { public function testPerformanceClean() {
$this->taskExec('COMPOSE_HTTP_TIMEOUT=200 docker-compose down --remove-orphans -v') $this->taskExec('COMPOSE_HTTP_TIMEOUT=200 docker compose down --remove-orphans -v')
->dir(__DIR__ . '/tests/performance') ->dir(__DIR__ . '/tests/performance')
->run(); ->run();
} }
@ -494,7 +494,7 @@ class RoboFile extends \Robo\Tasks {
*/ */
public function deleteDocker() { public function deleteDocker() {
return $this->taskExec( return $this->taskExec(
'docker-compose down -v --remove-orphans --rmi all' 'docker compose down -v --remove-orphans --rmi all'
)->dir(__DIR__ . '/../tests_env/docker')->run(); )->dir(__DIR__ . '/../tests_env/docker')->run();
} }
@ -504,7 +504,7 @@ class RoboFile extends \Robo\Tasks {
public function resetTestDocker() { public function resetTestDocker() {
return $this return $this
->taskExec( ->taskExec(
'docker-compose down -v --remove-orphans' 'docker compose down -v --remove-orphans'
)->dir(__DIR__ . '/../tests_env/docker') )->dir(__DIR__ . '/../tests_env/docker')
->addCode([$this, 'cleanupCachedFiles']) ->addCode([$this, 'cleanupCachedFiles'])
->run(); ->run();
@ -1609,7 +1609,7 @@ class RoboFile extends \Robo\Tasks {
$testType = $opts['test_type'] ?? 'acceptance'; $testType = $opts['test_type'] ?? 'acceptance';
$this->doctrineGenerateCache(); $this->doctrineGenerateCache();
return $this->taskExec( return $this->taskExec(
'COMPOSE_HTTP_TIMEOUT=200 docker-compose run ' . 'COMPOSE_HTTP_TIMEOUT=200 docker compose run ' .
(isset($opts['wordpress-version']) && $opts['wordpress-version'] ? '-e WORDPRESS_VERSION=' . $opts['wordpress-version'] . ' ' : '') . (isset($opts['wordpress-version']) && $opts['wordpress-version'] ? '-e WORDPRESS_VERSION=' . $opts['wordpress-version'] . ' ' : '') .
(isset($opts['skip-deps']) && $opts['skip-deps'] ? '-e SKIP_DEPS=1 ' : '') . (isset($opts['skip-deps']) && $opts['skip-deps'] ? '-e SKIP_DEPS=1 ' : '') .
(isset($opts['disable-hpos']) && $opts['disable-hpos'] ? '-e DISABLE_HPOS=1 ' : '') . (isset($opts['disable-hpos']) && $opts['disable-hpos'] ? '-e DISABLE_HPOS=1 ' : '') .

2
tests_env/docker/codeception/docker-entrypoint.sh
View File

@ -57,7 +57,7 @@ wp core version
# Load Composer dependencies # Load Composer dependencies
# Set SKIP_DEPS environment flag to not download them. E.g. you have downloaded them yourself # Set SKIP_DEPS environment flag to not download them. E.g. you have downloaded them yourself
# Example: docker-compose run -e SKIP_DEPS=1 codeception ... # Example: docker compose run -e SKIP_DEPS=1 codeception ...
if [[ -z "${SKIP_DEPS}" ]]; then if [[ -z "${SKIP_DEPS}" ]]; then
cd /project cd /project
./tools/vendor/composer.phar install ./tools/vendor/composer.phar install