Skip to content

Add containers for php and composer and adapt gitignore #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.idea
app/php/vendor
/var/
var/*
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
4 changes: 2 additions & 2 deletions app/php/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
$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);

// Elasticsearch Handler
$elasticaClient = new Client(
[
'host' => 'localhost',
'host' => 'elasticsearch',
'port' => 9200
]
);
Expand Down
18 changes: 17 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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'