diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 1be9598..5d4fbf7 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -82,6 +82,37 @@ jobs: exit 1; fi + - name: Run tests config disabled + if: matrix.PHP == '80' + env: + PHP_VERSION: ${{ matrix.PHP }} + run: | + docker-compose -f docker-compose.yml \ + -f docker-compose-${PHP_VERSION}.yml \ + -f docker-compose-config-disabled.yml \ + up --build -d + + echo $(docker run -t --network lemp jwilder/dockerize \ + -wait http://core_nginx/ \ + -timeout 60s) + + docker ps -a + docker logs app + + CONTENT=$(curl -s "http://127.0.0.1/"); + + echo "CHAMADA HTTP: ${CONTENT}"; + + if [ "${CONTENT}" != "core|${PHP_VERSION}|empty" ]; then + echo "Chamada HTTP retornou errado: ${CONTENT}" + exit 1; + fi + + docker-compose -f docker-compose.yml \ + -f docker-compose-${PHP_VERSION}.yml \ + -f docker-compose-config-disabled.yml \ + down -v + - name: Run tests prod env: PHP_VERSION: ${{ matrix.PHP }} diff --git a/docker-compose-config-disabled.yml b/docker-compose-config-disabled.yml new file mode 100644 index 0000000..4dd22d9 --- /dev/null +++ b/docker-compose-config-disabled.yml @@ -0,0 +1,7 @@ +version: '3.5' + +services: + + app: + environment: + - CONFIG_DISABLED=true \ No newline at end of file diff --git a/events/src-copied b/events/src-copied index 889ec4b..5a0659c 100644 --- a/events/src-copied +++ b/events/src-copied @@ -1,4 +1,10 @@ #!/bin/bash configure-volumes; -configure-db; + +if [ -z $CONFIG_DISABLED ]; then + configure-db; +else + echo "config-db: está desabilitado!"; +fi + configure-app ${APP_NAME}; \ No newline at end of file diff --git a/www80/public/index.php b/www80/public/index.php index ac67df1..a18f007 100644 --- a/www80/public/index.php +++ b/www80/public/index.php @@ -18,6 +18,19 @@ $versaoPhpFormatadaComPonto = $versaoPhp[0] . '.' . $versaoPhp[1]; $config = parse_ini_file(__DIR__ . "/../config.ini", true); + +$emptyConfig = [ + 'bd' => [ + 'host' => '', + 'user' => '', + 'password' => '', + 'bd' => '' + ], + 'php' => [ + 'version' => $versaoPhpFormatadaComPonto + ] +]; + $expectedConfig = [ 'bd' => [ 'host' => 'mysql', @@ -65,6 +78,11 @@ } if( count($validation) > 0 ) { + if($config === $emptyConfig) { + echo "core" . "|" . $versaoPhpFormatada . "|empty"; + return; + } + echo "
";
      echo join("\n", $validation);
      var_dump($config);