Merge remote-tracking branch 'origin/master'

.github/workflows/build_images.yml

@@ -0,0 +1,15 @@
+name: Build Images
+
+on:
+  workflow_dispatch:
+    inputs:
+      phalcon_version:
+        description: 'Framework version'
+        required: true
+        default: '5.2.1'
+
+jobs:
+  push_github_container_register:
+    uses: ./.github/workflows/github_container_registry.yml
+    with:
+      phalcon_version: ${{ github.event.inputs.phalcon_version }}

.github/workflows/github_container_registry.yml

@@ -1,25 +1,25 @@
 name: Publish GitHub Container Registry
 
 on:
-  workflow_dispatch:
+  workflow_call:
     inputs:
       phalcon_version:
         description: 'Framework version'
         required: true
-        default: '5.1.4'
+        type: string
 
 jobs:
   cli:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [ '7.4', '8.0', '8.1' ]
+        version: [ '7.4', '8.0', '8.1', '8.2' ]
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3
       - name: Build PHP ${{ matrix.version }} CLI version and publish
-        uses: elgohr/Publish-Docker-Github-Action@v4
+        uses: elgohr/Publish-Docker-Github-Action@v5
         env:
-          PHALCON_VERSION: ${{ github.event.inputs.phalcon_version }}
+          PHALCON_VERSION: ${{ inputs.phalcon_version }}
         with:
           name: phalcon/docker
           tags: ${{ matrix.version }},${{ matrix.version }}-cli

.github/workflows/test_dockerfile.yml

@@ -0,0 +1,17 @@
+name: Test Dockerfile
+
+on:
+  workflow_dispatch:
+    inputs:
+      path:
+        description: 'Path of Dockerfile'
+        required: true
+        default: '8.2'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build with PHP variant ${{ github.event.input.path }}
+        run: docker build --progress plain --file ${{ github.event.inputs.path }}/Dockerfile .

.github/workflows/test_dockerfiles.yml

@@ -12,6 +12,5 @@ jobs:
         version: [ '7.4', '8.0', '8.1', '8.2' ]
     steps:
       - uses: actions/checkout@v3
-
       - name: Build with PHP ${{ matrix.version }}
         run: docker build --progress=plain --file ${{ matrix.version }}/Dockerfile .

7.4/Dockerfile

@@ -1,14 +1,15 @@
-FROM php:7.4
+FROM php:7.4-cli
 
 ARG PSR_VERSION=1.1.0
-ARG PHALCON_VERSION=5.0.4
+ARG PHALCON_VERSION=5.2.1
 
 RUN set -xe && \
+        cd / && \
         # Download PSR, see https://github.com/jbboehr/php-psr
-        curl -LO https://github.com/jbboehr/php-psr/archive/v${PSR_VERSION}.tar.gz && \
+        curl -sSLO https://github.com/jbboehr/php-psr/archive/v${PSR_VERSION}.tar.gz && \
         tar xzf /v${PSR_VERSION}.tar.gz && \
         # Download Phalcon
-        curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
         tar xzf /v${PHALCON_VERSION}.tar.gz && \
         docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
             /php-psr-${PSR_VERSION} \

8.0/Dockerfile

@@ -1,11 +1,12 @@
-FROM php:8.0
+FROM php:8.0-cli
 
-ARG PHALCON_VERSION=5.0.4
+ARG PHALCON_VERSION=5.2.1
 
 RUN set -xe && \
+        cd / && \
         docker-php-source extract && \
         # Install ext-phalcon
-        curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
         tar xzf /v${PHALCON_VERSION}.tar.gz && \
         docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
             /cphalcon-${PHALCON_VERSION}/build/phalcon \

8.1/Dockerfile

@@ -1,11 +1,12 @@
-FROM php:8.1
+FROM php:8.1-cli
 
-ARG PHALCON_VERSION=5.0.4
+ARG PHALCON_VERSION=5.2.1
 
 RUN set -xe && \
+        cd / && \
         docker-php-source extract && \
         # Install ext-phalcon
-        curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
         tar xzf /v${PHALCON_VERSION}.tar.gz && \
         docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
             /cphalcon-${PHALCON_VERSION}/build/phalcon \

8.2/Dockerfile

@@ -1,11 +1,12 @@
-FROM php:8.2
+FROM php:8.2-cli-bullseye
 
 ARG PHALCON_VERSION=5.2.1
 
 RUN set -xe && \
+        cd / && \
         docker-php-source extract && \
         # Install ext-phalcon
-        curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
         tar xzf /v${PHALCON_VERSION}.tar.gz && \
         docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
             /cphalcon-${PHALCON_VERSION}/build/phalcon \

8.2/alpine3.16/cli/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-cli-alpine3.16
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/alpine3.16/fpm/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-fpm-alpine3.16
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/alpine3.16/zts/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-zts-alpine3.16
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/alpine3.17/cli/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-cli-alpine3.17
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/alpine3.17/fpm/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-fpm-alpine3.17
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/alpine3.17/zts/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-zts-alpine3.17
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/bullseye/apache/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-apache-bullseye
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/bullseye/cli/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-cli-bullseye
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/bullseye/fpm/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-fpm-bullseye
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/bullseye/zts/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-zts-bullseye
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/

8.2/buster/apache/Dockerfile

@@ -0,0 +1,22 @@
+FROM php:8.2-apache-buster
+
+ARG PHALCON_VERSION=5.2.1
+
+RUN set -xe && \
+        cd / && \
+        docker-php-source extract && \
+        # Install ext-phalcon
+        curl -sSLO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
+        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
+            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+        && \
+        # Remove all temp files
+        rm -r \
+            /v${PHALCON_VERSION}.tar.gz \
+            /cphalcon-${PHALCON_VERSION} \
+        && \
+        docker-php-source delete && \
+        php -m
+
+COPY docker-phalcon-* /usr/local/bin/