From a372d94f6dd15f5493039f7f3386386e5bfde600 Mon Sep 17 00:00:00 2001
From: noone-silent <lominum@protonmail.com>
Date: Mon, 14 Apr 2025 22:28:50 +0700
Subject: [PATCH 1/3] [#16752] - refactor: build docker images on release.
 Simplify dev images

---
 docker/Dockerfile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a125dbff16..d281e45018 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -113,20 +113,20 @@ FROM base AS prod
 
 # This part builds the last step required for production image.
 
-ARG PHALCON_VERSION=5.9.2
+ARG PHALCON_VERSION="v5.9.2"
 
 ENV PATH=/app/bin:/app:${PATH} \
     PHP_VERSION=${PHP_VERSION} \
     PHALCON_VERSION=${PHALCON_VERSION}
 
-LABEL org.opencontainer.image.title="Phalcon ${PHALCON_VERSION} with php ${PHP_VERSION}" \
-    org.opencontainer.image.description="Docker image including Phalcon and PHP on Debian Bookworm" \
-    org.opencontainer.image.authors="Phalcon Team <team@phalconphp.com>" \
-    org.opencontainer.image.vendor="Phalcon PHP Framework" \
-    org.opencontainer.image.licenses="BSD-3-Clause" \
-    org.opencontainer.image.version="${PHALCON_VERSION}-php${PHP_VERSION}" \
-    org.opencontainer.image.url="https://github.com/phalcon/cphalcon/" \
-    org.opencontainer.image.source="https://github.com/phalcon/cphalcon/tree/${PHALCON_VERSION}/docker/Dockerfile"
+LABEL org.opencontainers.image.title="Phalcon ${PHALCON_VERSION} with php ${PHP_VERSION}" \
+    org.opencontainers.image.description="Docker image including Phalcon and PHP on Debian Bookworm" \
+    org.opencontainers.image.authors="Phalcon Team <team@phalconphp.com>" \
+    org.opencontainers.image.vendor="Phalcon PHP Framework" \
+    org.opencontainers.image.licenses="BSD-3-Clause" \
+    org.opencontainers.image.version="${PHALCON_VERSION}-php${PHP_VERSION}" \
+    org.opencontainers.image.url="https://github.com/phalcon/cphalcon/tree/${PHALCON_VERSION}/docker/Dockerfile" \
+    org.opencontainers.image.source="https://github.com/phalcon/cphalcon/"
 
 COPY --from=phalcon /srv/ext/modules/phalcon.so /tmp/phalcon.so
 

From f3b4434f31fe97342ddfc568b222c43553def654 Mon Sep 17 00:00:00 2001
From: noone-silent <lominum@protonmail.com>
Date: Wed, 16 Apr 2025 08:10:12 +0700
Subject: [PATCH 2/3] [#16752] - refactor: build docker images on release.
 Simplify dev images

---
 .github/workflows/build-docker.yml | 2 +-
 docker/Dockerfile                  | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index d36bcb8ccd..6bebac7cb4 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -47,7 +47,7 @@ jobs:
           push: true
           file: docker/Dockerfile
           tags: |
-            phalcon/cphalcon:${{ github.ref_name }}-php${{ matrix.php }}
+            phalconphp/cphalcon:${{ github.ref_name }}-php${{ matrix.php }}
             ghcr.io/phalcon/cphalcon:${{ github.ref_name }}-php${{ matrix.php }}
           build-args: |
             PHP_VERSION=${{ matrix.php }}
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d281e45018..3c2b3fab0b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -24,6 +24,8 @@ RUN set -eux \
     && mkdir /app \
     && chown "${USER}":"${GROUP}" /app \
     && chmod 0770 /app \
+    && apt-get update \
+    && apt-get install -yq --no-install-recommends libfcgi-bin=2.* \
 # Install base extensions
     && install-php-extensions \
       apcu \
@@ -58,6 +60,7 @@ RUN set -eux \
       https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/master/php-fpm-healthcheck \
     && chown "${USER}":"${GROUP}" /usr/local/bin/php-fpm-healthcheck \
     && chmod 0770 /usr/local/bin/php-fpm-healthcheck \
+    && echo "pm.status_path = /status" >> /usr/local/etc/php-fpm.d/zz-docker.conf \
 # Set correct pid file location and permissions \
     && mkdir -p /run/php \
     && chown "${USER}":"${GROUP}" /run/php \
@@ -104,9 +107,11 @@ COPY ./ /srv
 
 RUN set -eux \
     && rm -rf /srv/vendor \
+# This is a cleanup for local tests and if a previous build has failed.
+    && find /srv -type f -iname '*.dep' -exec rm {} \;\
     && composer global require phalcon/zephir:dev-development \
     && /root/.composer/vendor/bin/zephir fullclean \
-    && /root/.composer/vendor/bin/zephir build \
+    && /root/.composer/vendor/bin/zephir build || cat compile-errors.log \
     && cat compile-errors.log
 
 FROM base AS prod

From d910b3bcf6994686767ae88ba1900b9ed38dfe3c Mon Sep 17 00:00:00 2001
From: noone-silent <lominum@protonmail.com>
Date: Wed, 16 Apr 2025 08:12:04 +0700
Subject: [PATCH 3/3] [#16752] - refactor: build docker images on release.
 Simplify dev images

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3c2b3fab0b..9a4c44530b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -111,7 +111,7 @@ RUN set -eux \
     && find /srv -type f -iname '*.dep' -exec rm {} \;\
     && composer global require phalcon/zephir:dev-development \
     && /root/.composer/vendor/bin/zephir fullclean \
-    && /root/.composer/vendor/bin/zephir build || cat compile-errors.log \
+    && /root/.composer/vendor/bin/zephir build \
     && cat compile-errors.log
 
 FROM base AS prod