Skip to content

Commit 26ad8a7

Browse files
authored
MCLOUD-7232: Fix healtchecker for docker php-fpm (#14)
1 parent 221845d commit 26ad8a7

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento-cloud-docker",
33
"description": "Magento Cloud Docker",
44
"type": "magento2-component",
5-
"version": "1.2.0",
5+
"version": "1.2.1",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"

images/nginx/1.19/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM nginx
1+
FROM nginx:1.19
22

33
ENV UPLOAD_MAX_FILESIZE 64M
44
ENV XDEBUG_HOST fpm_xdebug

images/php/7.2-fpm/fpm-healthcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -eo pipefail
33

4-
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-80}/status)
4+
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-8080}/status)
55

66
if [ "$fpm_response" == "200" ]
77
then

images/php/7.3-fpm/fpm-healthcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -eo pipefail
33

4-
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-80}/status)
4+
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-8080}/status)
55

66
if [ "$fpm_response" == "200" ]
77
then

images/php/7.4-fpm/fpm-healthcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -eo pipefail
33

4-
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-80}/status)
4+
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-8080}/status)
55

66
if [ "$fpm_response" == "200" ]
77
then

images/php/fpm/fpm-healthcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -eo pipefail
33

4-
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-80}/status)
4+
fpm_response=$(curl -o /dev/null -s -w "%{http_code}\n" http://${WEB_HOST:-web}:${WEB_PORT:-8080}/status)
55

66
if [ "$fpm_response" == "200" ]
77
then

tests/functional/Codeception/TestInfrastructure.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public function createArtifactCurrentTestedCode(string $name, string $version, a
226226
->wasSuccessful();
227227

228228
$skippedFiles = array_merge(
229-
['..', '.', 'vendor', '.git', '_workdir', 'vendor', 'composer.lock'],
229+
['..', '.', 'vendor', '.git', BaseModule::WORK_DIR, BaseModule::WORK_DIR_CACHE, 'composer.lock'],
230230
$skippedFiles
231231
);
232232
$files = [];

0 commit comments

Comments
 (0)