Skip to content

Commit a908891

Browse files
committed
MCLOUD-11659: Add php 8.3 to magento-cloud-docker
1 parent eed9383 commit a908891

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

src/Test/Functional/Acceptance/AcceptanceCest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public function testProductionMode(\CliTester $I): void
2828
$I->assertTrue($I->generateDockerCompose('--mode=production'), 'Command build:compose failed');
2929
$I->replaceImagesWithCustom();
3030
$I->startEnvironment();
31-
$I->runDockerComposeCommand('run --rm build cloud-build');
32-
$I->runDockerComposeCommand('run --rm deploy cloud-deploy');
33-
$I->runDockerComposeCommand('run --rm deploy cloud-post-deploy');
31+
$I->runDockerComposeCommand('run build cloud-build');
32+
$I->runDockerComposeCommand('run deploy cloud-deploy');
33+
$I->runDockerComposeCommand('run deploy cloud-post-deploy');
3434
$I->amOnPage('/');
3535
$I->see('Home page');
3636
$I->see('CMS homepage content goes here.');
@@ -51,9 +51,9 @@ public function testCustomHost(\CliTester $I): void
5151
);
5252
$I->replaceImagesWithCustom();
5353
$I->startEnvironment();
54-
$I->assertTrue($I->runDockerComposeCommand('run --rm build cloud-build'), 'Build phase failed');
55-
$I->assertTrue($I->runDockerComposeCommand('run --rm deploy cloud-deploy'), 'Deploy phase failed');
56-
$I->assertTrue($I->runDockerComposeCommand('run --rm deploy cloud-post-deploy'), 'Post deploy phase failed');
54+
$I->assertTrue($I->runDockerComposeCommand('run build cloud-build'), 'Build phase failed');
55+
$I->assertTrue($I->runDockerComposeCommand('run deploy cloud-deploy'), 'Deploy phase failed');
56+
$I->assertTrue($I->runDockerComposeCommand('run deploy cloud-post-deploy'), 'Post deploy phase failed');
5757
$I->amOnPage('/');
5858
$I->see('Home page');
5959
$I->see('CMS homepage content goes here.');

src/Test/Functional/Acceptance/DeveloperCest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ public function testDevPhpIni(CliTester $I)
3131
$I->replaceImagesWithCustom();
3232
$I->startEnvironment();
3333

34-
$I->runDockerComposeCommand('run --rm deploy php -i | grep opcache.validate_timestamps');
34+
$I->runDockerComposeCommand('run deploy php -i | grep opcache.validate_timestamps');
3535
$I->seeInOutput('=> On');
3636

37-
$I->runDockerComposeCommand('run --rm fpm php -i | grep opcache.validate_timestamps');
37+
$I->runDockerComposeCommand('run fpm php -i | grep opcache.validate_timestamps');
3838
$I->seeInOutput('=> On');
3939
}
4040
}

src/Test/Functional/Acceptance/MailHogCest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function runAndAssert(\CliTester $I): void
6161
$I->assertSame([0], $I->grabDataFromResponseByJsonPath('$.total'));
6262

6363
$I->assertTrue(
64-
$I->runDockerComposeCommand('run --rm deploy bash -c "php -r \"mail(\'[email protected]\',\'test\',\'test\');\""')
64+
$I->runDockerComposeCommand('run deploy bash -c "php -r \"mail(\'[email protected]\',\'test\',\'test\');\""')
6565
);
6666
$I->sendAjaxGetRequest('/api/v2/messages', ['limit' => 10]);
6767
$I->seeResponseIsJson();

tests/functional/Codeception/Docker.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function runDockerComposeCommand(string $command): bool
108108
public function resetFilesOwner(): bool
109109
{
110110
return $this->runDockerComposeCommand(
111-
'run --rm build bash -c "chown -R $(id -u):$(id -g) . /composer/cache"'
111+
'run build bash -c "chown -R $(id -u):$(id -g) . /composer/cache"'
112112
);
113113
}
114114

tests/functional/Robo/Tasks/DockerCompose/Run.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function __construct($container)
6363
public function getCommand()
6464
{
6565
return trim(sprintf(
66-
'docker-compose run --rm -w %s %s %s ' . $this->runWrapper,
66+
'docker-compose run -w %s %s %s ' . $this->runWrapper,
6767
escapeshellarg($this->workingDir),
6868
$this->arguments,
6969
escapeshellarg($this->container),

tests/functional/Robo/Tasks/EnvCleanUp.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getCommand(): string
4444

4545
foreach ($this->volumes as $volume) {
4646
$commands[] = sprintf(
47-
'docker-compose run --rm %s bash -c "mkdir -p %s"',
47+
'docker-compose run %s bash -c "mkdir -p %s"',
4848
Docker::BUILD_CONTAINER,
4949
$volume
5050
);

0 commit comments

Comments
 (0)