Merge branch 'master' of https://github.com/alchemy-fr/phrasea into P…

…S-745-use-logo
alchemy-fr · Dec 3, 2024 · 051e854 · 051e854
2 parents a895b92 + bf36a79
commit 051e854
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/infra/docker/nginx-cache-purge/Dockerfile b/infra/docker/nginx-cache-purge/Dockerfile
@@ -3,9 +3,9 @@ ARG NGINX_VERSION=1.20.1
 FROM nginx:${NGINX_VERSION}-alpine AS builder
 
 # nginx:alpine contains NGINX_VERSION environment variable, like so:
-# ENV NGINX_VERSION 1.15.0
+# ENV NGINX_VERSION=1.15.0
 
-ENV PURGE_CACHE_VERSION 2.3
+ENV PURGE_CACHE_VERSION=2.3
 
 # Download sources
 RUN mkdir -p /usr/src \

diff --git a/infra/docker/report-elk/logstash/Dockerfile b/infra/docker/report-elk/logstash/Dockerfile
@@ -13,4 +13,4 @@ COPY ./config/logstash.yml /usr/share/logstash/config/logstash.yml
 COPY ./files/report.sql /usr/share/logstash/files/report.sql
 COPY ./pipeline/logstash.conf /usr/share/logstash/pipeline/logstash.conf
 
-ENV ELASTICSEARCH_HOST elasticsearch-report:9200
+ENV ELASTICSEARCH_HOST=elasticsearch-report:9200
diff --git a/lib/php/messenger-bundle/Listener/TerminateStackListener.php b/lib/php/messenger-bundle/Listener/TerminateStackListener.php
@@ -7,10 +7,12 @@
 use Symfony\Component\Console\ConsoleEvents;
 use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Messenger\Event\WorkerMessageHandledEvent;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 #[AsEventListener(KernelEvents::TERMINATE, 'onTerminate')]
 #[AsEventListener(ConsoleEvents::TERMINATE, 'onTerminate')]
+#[AsEventListener(WorkerMessageHandledEvent::class, method: 'onTerminate')]
 final class TerminateStackListener
 {
     private array $callbacks = [];

diff --git a/report/Dockerfile b/report/Dockerfile
@@ -16,4 +16,4 @@ RUN go build -o app . \
 
 EXPOSE 80
 
-CMD ./go.sh
+CMD ["./go.sh"]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@ RUN go build -o app . \

		EXPOSE 80

		CMD ./go.sh
		CMD ["./go.sh"]