From 05cee009d88f114736700fc3b95c0bd98daadde4 Mon Sep 17 00:00:00 2001 From: turegjorup Date: Fri, 24 May 2024 11:06:17 +0200 Subject: [PATCH 1/2] 1456: Fixed "parameter not set" in api image --- infrastructure/os2display/display-api-service/Dockerfile | 3 ++- .../os2display/display-api-service/docker-entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/infrastructure/os2display/display-api-service/Dockerfile b/infrastructure/os2display/display-api-service/Dockerfile index d2e4f81c..2809349f 100644 --- a/infrastructure/os2display/display-api-service/Dockerfile +++ b/infrastructure/os2display/display-api-service/Dockerfile @@ -151,4 +151,5 @@ RUN chmod +x /usr/local/bin/docker-entrypoint.sh WORKDIR ${APP_PATH} -CMD [ "docker-entrypoint.sh" ] +CMD ["php-fpm"] +ENTRYPOINT [ "docker-entrypoint.sh" ] diff --git a/infrastructure/os2display/display-api-service/docker-entrypoint.sh b/infrastructure/os2display/display-api-service/docker-entrypoint.sh index fe031868..8ad622b4 100644 --- a/infrastructure/os2display/display-api-service/docker-entrypoint.sh +++ b/infrastructure/os2display/display-api-service/docker-entrypoint.sh @@ -17,6 +17,6 @@ if [ "${1#-}" != "$1" ]; then fi ## Start the PHP FPM process. -echo "Starting PHP 8.2 FPM" +echo "Starting PHP 8.3 FPM" -exec php-fpm "$@" +exec "$@" From 01c7015e5c2fe62f6c20728135fbf2803891c3c3 Mon Sep 17 00:00:00 2001 From: turegjorup Date: Fri, 24 May 2024 11:41:00 +0200 Subject: [PATCH 2/2] 1456: Update Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ed4a741..f7fb9ad3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +- [#207](https://github.com/os2display/display-api-service/pull/207) + - Fixed parameter not set error in (os2display) api container. + ## [2.0.4] - 2024-04-25 - [#204](https://github.com/os2display/display-api-service/pull/204)