Skip to content

Commit 2f3258a

Browse files
BaDosBaDos
authored
Merge pull request #86 from magento-commerce/develop
MCLOUD-8486: Release Cloud Tools
2 parents 229ad4c + 861ee2e commit 2f3258a

File tree

114 files changed

+1559
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1559
-179
lines changed

‎.github/.metadata.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"templateVersion": "0.1",
3+
"product": {
4+
"name": "Magento Cloud Docker",
5+
"description": "The Magento Cloud Docker implementation deploys Cloud projects to a local workstation so that you can develop and test your code in a simulated Cloud environment"
6+
},
7+
"contacts": {
8+
"team": {
9+
"name": "Magic Mountain",
10+
"DL": "Grp-magento-cloud-all",
11+
"slackChannel": "magic_mountain"
12+
}
13+
},
14+
"ticketTracker": {
15+
"functionalJiraQueue": {
16+
"projectKey": "MCLOUD"
17+
},
18+
"securityJiraQueue": {
19+
"projectKey": "MAGREQ",
20+
"component": "Magento Cloud Engineering"
21+
}
22+
},
23+
"staticScan": {
24+
"enable": false
25+
}
26+
}

‎composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
"name": "magento/magento-cloud-docker",
33
"description": "Magento Cloud Docker",
44
"type": "magento2-component",
5-
"version": "1.3.0",
5+
"version": "1.3.1",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"
99
],
1010
"require": {
11-
"php": "^7.2",
11+
"php": "^7.2 || ^8.0",
1212
"ext-json": "*",
13-
"composer/composer": "^1.0||^2.0",
14-
"composer/semver": "^1.0||^2.0||^3.0",
15-
"illuminate/config": "^5.5",
16-
"symfony/config": "^4.4||^5.1",
17-
"symfony/console": "^2.8||^4.0",
18-
"symfony/dependency-injection": "^3.3||^4.3||^5.1",
19-
"symfony/yaml": "^3.3||^4.0||^5.1"
13+
"composer/composer": "^1.4 || ^2.0",
14+
"composer/semver": "@stable",
15+
"illuminate/config": "^5.5||^8.77",
16+
"symfony/config": "^4.4 || ^5.1",
17+
"symfony/console": "^2.8 || ^4.0 || ^5.1",
18+
"symfony/dependency-injection": "^3.3 || ^4.3 || ^5.1",
19+
"symfony/yaml": "^3.3 || ^4.0 || ^5.1"
2020
},
2121
"require-dev": {
2222
"codeception/codeception": "^4.1",
@@ -27,7 +27,7 @@
2727
"consolidation/robo": "^1.2",
2828
"phpmd/phpmd": "@stable",
2929
"phpstan/phpstan": "^0.12",
30-
"phpunit/phpunit": "^8.5",
30+
"phpunit/phpunit": "^8.5 || ^9.5",
3131
"squizlabs/php_codesniffer": "^3.0"
3232
},
3333
"bin": [

‎config/services.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Database\DbSales" />
2525
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Redis" />
2626
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\ElasticSearch" />
27+
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\OpenSearch" />
2728
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Fpm" />
2829
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Web" />
2930
<argument type="service" id="Magento\CloudDocker\Compose\ProductionBuilder\Service\Varnish" />

‎dist/bin/magento-docker

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ USAGE="Magento Cloud Docker
2525
php 7.3 run a command in a PHP 7.3 container
2626
php 7.4 run a command in a PHP 7.4 container
2727
php 8.0 run a command in a PHP 8.0 container
28+
php 8.1 run a command in a PHP 8.1 container
2829
copy-to copy to container (use --all or specific file/directory)
2930
copy-from copy from container (use --all or specific file/directory)
3031
fix-owns fix ownership to www:www

‎images/elasticsearch/5.2/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎images/elasticsearch/5.2/docker-entrypoint.sh

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎images/elasticsearch/6.5/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:6.5.4
22

3-
RUN yum -y install zip
4-
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
3+
RUN yum -y install zip && \
4+
zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
5+
yum remove -y zip && \
6+
yum -y clean all && \
7+
rm -rf /var/cache
58

69
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
710

‎images/elasticsearch/6.5/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -eo pipefail
33

44
if [[ -n "$ES_PLUGINS" ]]; then
5-
echo "Intalling plugins: $ES_PLUGNS"
5+
echo "Installing plugins: $ES_PLUGNS"
66
for PLUGIN in $ES_PLUGINS
77
do
88
./bin/elasticsearch-plugin install -b "$PLUGIN"

‎images/elasticsearch/6.8/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
FROM docker.elastic.co/elasticsearch/elasticsearch:6.8.15
22

3-
RUN yum -y install zip
4-
RUN zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class
3+
RUN yum -y install zip && \
4+
zip -q -d /usr/share/elasticsearch/lib/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
5+
yum remove -y zip && \
6+
yum -y clean all && \
7+
rm -rf /var/cache
58

69
RUN echo "xpack.security.enabled: false" >> /usr/share/elasticsearch/config/elasticsearch.yml
710
RUN echo "discovery.type: single-node" >> /usr/share/elasticsearch/config/elasticsearch.yml

‎images/elasticsearch/6.8/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -eo pipefail
33

44
if [[ -n "$ES_PLUGINS" ]]; then
5-
echo "Intalling plugins: $ES_PLUGNS"
5+
echo "Installing plugins: $ES_PLUGNS"
66
for PLUGIN in $ES_PLUGINS
77
do
88
./bin/elasticsearch-plugin install -b "$PLUGIN"

0 commit comments

Comments
 (0)