major updates (#61)

MilesChou · Nov 14, 2023 · b566376 · b566376
1 parent 89d21f5
commit b566376
Show file tree

Hide file tree

Showing 14 changed files with 89 additions and 321 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,70 @@
+name: ci
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+
+env:
+  IMAGE_NAME: mileschou/phalcon
+  PHALCON_VERSION: 5.3.1
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 8
+      fail-fast: true
+      matrix:
+        php:
+          - 8.2
+          - 8.1
+          - "8.0"
+          - 7.4
+        variant:
+          - "" # cli
+          - -fpm
+        os:
+          - "" # debian-latest
+          - -alpine
+    env:
+      PHP_VARIANT: ${{ matrix.php }}${{ matrix.variant }}${{ matrix.os }}
+
+    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Build
+        uses: docker/build-push-action@v5
+        with:
+          load: true
+          file: Dockerfile${{ matrix.os }}
+          build-args: |
+            PHP_VARIANT=${{ env.PHP_VARIANT }}
+            PHALCON_VERSION=${{ env.PHALCON_VERSION }}
+          tags: ${{ env.IMAGE_NAME }}:${{ env.PHP_VARIANT }}-tesing
+      -
+        name: Test
+        run: docker run --rm ${{ env.IMAGE_NAME }}:${{ env.PHP_VARIANT }}-tesing sh -c "php -v; php --ri phalcon | grep -i ^version"
+
+      -
+        name: Login
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        if: github.event_name != 'pull_request'
+        uses: docker/build-push-action@v5
+        with:
+          push: true
+          file: Dockerfile${{ matrix.os }}
+          build-args: |
+            PHP_VARIANT=${{ env.PHP_VARIANT }}
+            PHALCON_VERSION=${{ env.PHALCON_VERSION }}
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ env.IMAGE_NAME }}:${{ env.PHP_VARIANT }}
diff --git a/.github/workflows/test_dockerfile.yml b/.github/workflows/test_dockerfile.yml
diff --git a/7.4/Dockerfile b/7.4/Dockerfile
diff --git a/7.4/alpine/Dockerfile b/7.4/alpine/Dockerfile
diff --git a/7.4/apache/Dockerfile b/7.4/apache/Dockerfile
diff --git a/7.4/fpm-alpine/Dockerfile b/7.4/fpm-alpine/Dockerfile
diff --git a/7.4/fpm/Dockerfile b/7.4/fpm/Dockerfile
diff --git a/8.0/Dockerfile b/8.0/Dockerfile
diff --git a/8.0/alpine/Dockerfile b/8.0/alpine/Dockerfile
diff --git a/8.1/Dockerfile → Dockerfile b/8.1/Dockerfile → Dockerfile
@@ -1,4 +1,6 @@
-FROM php:8.1
+ARG PHP_VARIANT=8.2
+
+FROM php:${PHP_VARIANT}
 
 LABEL maintainer="MilesChou <github.com/MilesChou>, fizzka <github.com/fizzka>"
 
@@ -7,16 +9,14 @@ ARG PHALCON_VERSION=5.0.4
 RUN set -xe && \
         docker-php-source extract && \
         # Install ext-phalcon
-        curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
-        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        cd /tmp && \
+        curl -LO https://github.com/phalcon/cphalcon/releases/download/v${PHALCON_VERSION}/phalcon-pecl.tgz && \
+        tar xzf phalcon-pecl.tgz && \
         docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
-            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+            /tmp/phalcon-${PHALCON_VERSION} \
         && \
         # Remove all temp files
-        rm -r \
-            /v${PHALCON_VERSION}.tar.gz \
-            /cphalcon-${PHALCON_VERSION} \
-        && \
+        rm -r /tmp/phalcon-* && \
         docker-php-source delete && \
         php -m
 

diff --git a/8.1/alpine/Dockerfile → Dockerfile-alpine b/8.1/alpine/Dockerfile → Dockerfile-alpine
@@ -1,9 +1,11 @@
-FROM php:8.1-alpine
+ARG PHP_VARIANT=8.2
 
-LABEL maintainer="MilesChou <github.com/MilesChou>, fizzka <github.com/fizzka>"
+FROM php:${PHP_VARIANT}
 
 ARG PHALCON_VERSION=5.0.4
 
+LABEL maintainer="MilesChou <github.com/MilesChou>, fizzka <github.com/fizzka>"
+
 RUN set -xe && \
         apk add --no-cache --virtual .build-deps \
             autoconf \
@@ -12,16 +14,14 @@ RUN set -xe && \
         && \
         docker-php-source extract && \
         # Install ext-phalcon
-        curl -LO https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.tar.gz && \
-        tar xzf /v${PHALCON_VERSION}.tar.gz && \
+        cd /tmp && \
+        curl -LO https://github.com/phalcon/cphalcon/releases/download/v${PHALCON_VERSION}/phalcon-pecl.tgz && \
+        tar xzf phalcon-pecl.tgz && \
         docker-php-ext-install -j $(getconf _NPROCESSORS_ONLN) \
-            /cphalcon-${PHALCON_VERSION}/build/phalcon \
+            /tmp/phalcon-${PHALCON_VERSION} \
         && \
         # Remove all temp files
-        rm -r \
-            /v${PHALCON_VERSION}.tar.gz \
-            /cphalcon-${PHALCON_VERSION} \
-        && \
+        rm -r /tmp/phalcon-* && \
         docker-php-source delete && \
         apk del .build-deps && \
         php -m