Skip to content

Commit ec086cc

Browse files
author
Alexander Miertsch
authored
Merge pull request #6 from event-engine/fix/missing_amp
Add php-ext-amqp to prooph PHP image
2 parents b2e742f + 9e135d7 commit ec086cc

File tree

4 files changed

+9
-38
lines changed

4 files changed

+9
-38
lines changed

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- .:/var/www
1313

1414
php:
15-
image: prooph/php:7.4-fpm
15+
build: ./env/php
1616
volumes:
1717
- .:/var/www
1818
env_file:

env/php/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM prooph/php:7.4-fpm
2+
3+
# Add php-ext-amqp
4+
RUN apk add --no-cache --no-progress --virtual BUILD_DEPS_PHP_AMQP rabbitmq-c-dev \
5+
&& apk add --no-cache --no-progress rabbitmq-c \
6+
&& apk add --no-cache git autoconf automake gawk build-base \
7+
&& pecl install amqp \
8+
&& docker-php-ext-enable amqp

public/index.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Laminas\Stratigility\MiddlewarePipe;
1515
use Mezzio\Helper\BodyParams\BodyParamsMiddleware;
1616
use Mezzio\ProblemDetails\ProblemDetailsMiddleware;
17-
use MyService\Http\CorsMiddleware;
1817
use MyService\Http\OriginalUriMiddleware;
1918
use Psr\Http\Message\ServerRequestInterface as Request;
2019
use Psr\Http\Message\ResponseInterface as Response;
@@ -37,9 +36,6 @@
3736

3837
$app->pipe($container->get(ProblemDetailsMiddleware::class));
3938

40-
// CORS middleware ensures that cockpit can access the Event Engine backend, since it runs on another port
41-
$app->pipe(new CorsMiddleware());
42-
4339
$app->pipe(new BodyParamsMiddleware());
4440

4541
$app->pipe(new OriginalUriMiddleware());

src/Http/CorsMiddleware.php

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)