Merge branch 'main' into patch-1

opencodeco · Jan 3, 2025 · 61dbd98 · 61dbd98
2 parents ee66c1f + bcbd8b5
commit 61dbd98
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -1,5 +1,4 @@
 name: Docker
-
 on:
   pull_request:
   push:
@@ -12,11 +11,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - php: 81
+          - alpine: '3.19' 
+            php: 81
             without-watchr: 1
-          - php: 82
+          - alpine: '3.20'
+            php: 82
             without-watchr: ''
-          - php: 83
+          - alpine: '3.20'
+            php: 83
             without-watchr: ''
     steps:
       -
@@ -41,6 +43,7 @@ jobs:
           context: .
           load: true
           build-args: |
+            ALPINE=${{ matrix.alpine }}
             PHP=${{ matrix.php }}
             WITHOUT_WATCHR=${{ matrix.without-watchr }}
           tags: opencodeco/phpctl:php${{ matrix.php }}
@@ -58,5 +61,7 @@ jobs:
         with:
           context: .
           push: true
-          build-args: PHP=${{ matrix.php }}
+          build-args: |
+            ALPINE=${{ matrix.alpine }}
+            PHP=${{ matrix.php }}
           tags: opencodeco/phpctl:php${{ matrix.php }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-ARG ALPINE=3.19
-FROM alpine:${ALPINE}
+ARG ALPINE=3.20
+FROM alpine:$ALPINE
 
 ARG PHP
 ENV PHP_VERSION=$PHP

diff --git a/rootfs/etc/apk/repositories b/rootfs/etc/apk/repositories
diff --git a/rootfs/usr/local/bin/install-swoole b/rootfs/usr/local/bin/install-swoole
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 set -e
 
-SWOOLE_VERSION="5.1.2"
+SWOOLE_VERSION="5.1.4"
 echo "Installing Swoole $SWOOLE_VERSION"
 
 # Download

diff --git a/src-devc/.devcontainer/Dockerfile b/src-devc/.devcontainer/Dockerfile
@@ -5,7 +5,7 @@ ENV PHP_VERSION $PHP_VERSION
 COPY rootfs /
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends libcurl4-openssl-dev libc-ares-dev libsqlite3-dev libpq-dev git parallel unzip wget \
+    && apt-get -y install --no-install-recommends libcurl4-openssl-dev libc-ares-dev libsqlite3-dev libpq-dev git parallel unzip wget libbrotli-dev \
     && mv /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini \
     && mv /etc/php/php.ini /usr/local/etc/php/conf.d/zzphp.ini \
     && install-php-extensions sockets && install-swoole && install-tools