Skip to content

Commit cb5ce1b

Browse files
committed
Add containers for php and composer and adapt gitignore
1 parent db18cac commit cb5ce1b

File tree

4 files changed

+24
-6
lines changed

4 files changed

+24
-6
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
.idea
22
app/php/vendor
3-
/var/
3+
var/*

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ docker-compose up -d
1414
Install needed PHP dependencies
1515

1616
```
17-
cd app && composer install
17+
docker-compose run --rm composer composer install --ignore-platform-reqs
1818
```
1919

2020
Execute the PHP sample application
2121

2222
```
23-
php app/php/app.php -a fo1 -b bar
23+
docker-compose run --rm php php app.php -a fo1 -b bar
2424
```

app/php/app.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
$log->pushHandler($stdoutHandler);
2020

2121
// File Handler
22-
$fileHandler = new RotatingFileHandler('../var/logs/app.log', 0, Logger::DEBUG);
22+
$fileHandler = new RotatingFileHandler('/logs/app.log', 0, Logger::DEBUG);
2323
$formatter = new JsonFormatter();
2424
$fileHandler->setFormatter($formatter);
2525
$log->pushHandler($fileHandler);
2626

2727
// Elasticsearch Handler
2828
$elasticaClient = new Client(
2929
[
30-
'host' => 'localhost',
30+
'host' => 'elasticsearch',
3131
'port' => 9200
3232
]
3333
);

docker-compose.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
user: root
3939
volumes:
4040
- './var/filebeat/log/:/var/log/:ro'
41-
- './var/filebeat/docker.sock:/var/run/docker.sock'
41+
- '/var/run/docker.sock:/var/run/docker.sock'
4242
- './var/logs/:/var/lib/docker/containers/logs:ro'
4343
- './etc/filebeat/filebeat.yml:/usr/share/filebeat/filebeat.yml'
4444
command: ["--strict.perms=false"]
@@ -52,3 +52,21 @@ services:
5252
depends_on:
5353
- elasticsearch
5454

55+
composer:
56+
image: composer:1.10
57+
container_name: composer
58+
working_dir: /app
59+
depends_on:
60+
- elasticsearch
61+
volumes:
62+
- './app/php:/app'
63+
64+
php:
65+
image: php:8.0-fpm
66+
container_name: php
67+
working_dir: /app
68+
depends_on:
69+
- elasticsearch
70+
volumes:
71+
- './app/php:/app'
72+
- './var/logs:/logs'

0 commit comments

Comments
 (0)