diff --git a/.gitignore b/.gitignore index 5797d25..7fb92b2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ .idea app/php/vendor -/var/ \ No newline at end of file +var/* diff --git a/README.md b/README.md index 13a688e..3f110e0 100644 --- a/README.md +++ b/README.md @@ -14,11 +14,11 @@ docker-compose up -d Install needed PHP dependencies ``` -cd app && composer install +docker-compose run --rm composer composer install --ignore-platform-reqs ``` Execute the PHP sample application ``` -php app/php/app.php -a fo1 -b bar +docker-compose run --rm php php app.php -a fo1 -b bar ``` diff --git a/app/php/app.php b/app/php/app.php index c4c68df..2c77f13 100644 --- a/app/php/app.php +++ b/app/php/app.php @@ -19,7 +19,7 @@ $log->pushHandler($stdoutHandler); // File Handler -$fileHandler = new RotatingFileHandler('../var/logs/app.log', 0, Logger::DEBUG); +$fileHandler = new RotatingFileHandler('/logs/app.log', 0, Logger::DEBUG); $formatter = new JsonFormatter(); $fileHandler->setFormatter($formatter); $log->pushHandler($fileHandler); @@ -27,7 +27,7 @@ // Elasticsearch Handler $elasticaClient = new Client( [ - 'host' => 'localhost', + 'host' => 'elasticsearch', 'port' => 9200 ] ); diff --git a/docker-compose.yml b/docker-compose.yml index 984246a..d7470f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: user: root volumes: - './var/filebeat/log/:/var/log/:ro' - - './var/filebeat/docker.sock:/var/run/docker.sock' + - '/var/run/docker.sock:/var/run/docker.sock' - './var/logs/:/var/lib/docker/containers/logs:ro' - './etc/filebeat/filebeat.yml:/usr/share/filebeat/filebeat.yml' command: ["--strict.perms=false"] @@ -52,3 +52,19 @@ services: depends_on: - elasticsearch + composer: + image: composer:2.1 + container_name: composer + working_dir: /app + volumes: + - './app/php:/app' + + php: + image: php:8.0-fpm + container_name: php + working_dir: /app + depends_on: + - elasticsearch + volumes: + - './app/php:/app' + - './var/logs:/logs'