Merge branch 'main' into patch-1

.github/workflows/devcontainer.yml

@@ -9,6 +9,16 @@ on:
 jobs:
   devcontainer:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - php: 81
+            php-str: 8.1
+          - php: 82
+            php-str: 8.2
+          - php: 83
+            php-str: 8.3
+
     steps:
       -
         name: Checkout
@@ -28,8 +38,11 @@ jobs:
       -
         name: Build and run dev container task
         uses: devcontainers/[email protected]
+        env:
+          PHP_VERSION: ${{ matrix.php }}
+          PHP_VERSION_STR: ${{ matrix.php-str }}
         with:
           subFolder: src-devc
           imageName: opencodeco/phpctl
-          imageTag: php83-devcontainer
+          imageTag: php${{ matrix.php }}-devcontainer
           push: always

Dockerfile

@@ -11,12 +11,14 @@ ARG WITHOUT_WATCHR
 ENV WITHOUT_WATCHR=$WITHOUT_WATCHR
 
 COPY rootfs /
-RUN apk add --upgrade --update --no-cache \
+RUN apk update && apk upgrade && apk add --no-cache \
         git \
         docker-cli \
         php${PHP}-cli \
         php${PHP}-ctype \
+        php${PHP}-curl \
         php${PHP}-dom \
+        php${PHP}-ffi \
         php${PHP}-fileinfo \
         php${PHP}-gd \
         php${PHP}-iconv \

Makefile

@@ -14,6 +14,6 @@ test:
 install:
 	@sudo ./scripts/symlink-bins.sh
 
-.PHONY: devcontainer
-devcontainer:
-	@devcontainer build --workspace-folder src-devc --push true --image-name opencodeco/phpctl:php83-devcontainer
+.PHONY: devcontainers
+devcontainers:
+	@parallel --line-buffer PHP_VERSION={} ./src-devc/build.sh ::: 81 82 83

src-devc/.devcontainer/Dockerfile

@@ -1,8 +1,11 @@
-FROM php:8.3-bookworm
+ARG PHP_VERSION 83
+ARG PHP_VERSION_STR 8.3
+FROM php:${PHP_VERSION_STR}-cli-bookworm
+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 unzip wget \
+    && apt-get -y install --no-install-recommends libcurl4-openssl-dev libc-ares-dev libsqlite3-dev libpq-dev git parallel unzip wget \
     && 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

src-devc/.devcontainer/devcontainer.json

@@ -1,7 +1,11 @@
 {
     "build": {
         "dockerfile": "./Dockerfile",
-        "context": "../.."
+        "context": "../..",
+        "args": {
+            "PHP_VERSION": "${localEnv:PHP_VERSION}",
+            "PHP_VERSION_STR": "${localEnv:PHP_VERSION_STR}"
+        }
     },
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {

src-devc/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+export PHP_VERSION_STR="${PHP_VERSION:0:1}.${PHP_VERSION:1}"
+devcontainer build --workspace-folder src-devc --push true --image-name "opencodeco/phpctl:php$PHP_VERSION-devcontainer"

src/docker.sh

@@ -59,7 +59,7 @@ run() {
     if [ -n "$GIT_EXEC_PATH" ]; then
         # In a Git hook environment, we need to disable TTY allocation
         PHPCTL_TTY="--label=no-tty"
-    fi
+	fi
 
     # shellcheck disable=SC2046
     # shellcheck disable=SC2068