Skip to content

Commit a510d55

Browse files
author
Julien Neuhart
committed
Test slim onbluid composer #6
1 parent dd52032 commit a510d55

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

tests/slim_onbuild_composer/Dockerfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,5 @@ FROM thecodingmachine/php:${PHP_VERSION}-${BRANCH}-slim-${BRANCH_VARIANT}
77

88
COPY composer.json composer.json
99

10-
RUN php -m
11-
12-
RUN which php
13-
14-
RUN sudo tee "/etc/php/${PHP_VERSION}/mods-available/generated_conf.ini"
15-
1610
# Let's check that GD is available.
1711
RUN composer install

utils/check_php_env_var_changes.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
$phpEnvVarCache = include '/opt/php_env_var_cache.php';
44

5+
error_log(var_export($phpEnvVarCache, true));
6+
57
$envVars = getenv();
8+
9+
error_log(var_export($envVars, true));
10+
611
$shouldGenerateConfig = false;
712
$phpEnvVar = [];
813

@@ -20,6 +25,8 @@
2025
}
2126
}
2227

28+
error_log(var_export($phpEnvVar, true));
29+
2330
if ($shouldGenerateConfig === false) {
2431
echo "0";
2532
exit(0);

utils/php_proxy.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,8 @@
22

33
sudo chown docker:docker /opt/php_env_var_cache.php
44

5-
echo "IN PROXY"
6-
75
REGENERATE=$(/usr/bin/real_php /usr/local/bin/check_php_env_var_changes.php)
86

9-
echo "REGENERATE=$REGENERATE"
10-
117
if [[ "$REGENERATE" != "0" ]] && [[ "$REGENERATE" != "1" ]]; then
128
exit 1
139
fi

0 commit comments

Comments
 (0)