Skip to content

Commit 7d4e08b

Browse files
authored
MAGECLOUD-5054: Add single quotes around alpine image in docker-compose.yml (#157)
1 parent 4f0fa96 commit 7d4e08b

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

src/Compose/ProductionBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ public function build(Config $config): Manager
384384
self::SERVICE_GENERIC,
385385
$this->serviceFactory->create(
386386
ServiceInterface::SERVICE_GENERIC,
387-
'',
387+
$config->getServiceVersion(self::SERVICE_GENERIC),
388388
[
389389
'environment' => $this->converter->convert(array_merge(
390390
$config->getVariables(),

src/Config/Source/CloudBaseSource.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ class CloudBaseSource implements SourceInterface
2929
ServiceInterface::SERVICE_SELENIUM => false,
3030
ServiceInterface::SERVICE_NGINX => true,
3131
ServiceInterface::SERVICE_TLS => true,
32-
ServiceInterface::SERVICE_VARNISH => true
32+
ServiceInterface::SERVICE_VARNISH => true,
33+
ServiceInterface::SERVICE_GENERIC => true
3334
];
3435

3536
/**

src/Service/ServiceFactory.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,8 @@ class ServiceFactory
116116
],
117117
ServiceInterface::SERVICE_GENERIC => [
118118
'image' => 'alpine',
119-
'pattern' => '%s'
119+
'version' => 'latest',
120+
'pattern' => self::PATTERN_STD
120121
],
121122
ServiceInterface::SERVICE_SELENIUM => [
122123
'image' => 'selenium/standalone-chrome',

src/Test/Integration/_files/cloud_base/docker-compose.exp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ services:
109109
condition: service_started
110110
generic:
111111
hostname: generic.magento2.docker
112-
image: alpine
112+
image: 'alpine:latest'
113113
environment:
114114
- PHP_MEMORY_LIMIT=2048M
115115
- UPLOAD_MAX_FILESIZE=64M

src/Test/Integration/_files/cloud_base_mftf/docker-compose.exp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ services:
150150
condition: service_healthy
151151
generic:
152152
hostname: generic.magento2.docker
153-
image: alpine
153+
image: 'alpine:latest'
154154
environment:
155155
- PHP_MEMORY_LIMIT=2048M
156156
- UPLOAD_MAX_FILESIZE=64M

0 commit comments

Comments
 (0)