Merge branch 'main' of github.com:opencodeco/phpctl

Author: leocavalcante

.devcontainer/devcontainer.json

@@ -1,17 +1,14 @@
 {
     "image": "opencodeco/phpctl:php83-devcontainer",
+    "containerEnv": {
+        "PHP_VERSION": "83"
+    },
     "features": {
         "ghcr.io/devcontainers/features/docker-in-docker:2": {},
         "ghcr.io/devcontainers-contrib/features/devcontainers-cli:1": {},
-        "ghcr.io/devcontainers/features/sshd:1": {}
-    },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "ms-vscode.makefile-tools",
-                "ms-azuretools.vscode-docker",
-                "timonwong.shellcheck"
-            ]
+        "ghcr.io/devcontainers/features/sshd:1": {},
+        "ghcr.io/devcontainers-contrib/features/apt-get-packages:1": {
+            "packages": "parallel"
         }
     }
 }

Makefile

@@ -8,6 +8,7 @@ build:
 .PHONY: test
 test:
 	@parallel --line-buffer PHP_VERSION={} COMPOSER_AUTH= TERM= ./bin/notty ./lib/bashunit ./tests/ ::: 81 82 83
+	@[ -f phpctl.ini ] && rm phpctl.ini
 
 .PHONY: install
 install:

README.md

@@ -7,10 +7,12 @@
       <h1>
         phpctl
         <a href="https://github.com/opencodeco/phpctl/actions/workflows/docker.yml"><img alt="phpctl docker badge" src="https://github.com/opencodeco/phpctl/actions/workflows/docker.yml/badge.svg"></a>
+        <a href="https://github.com/opencodeco/phpctl/actions/workflows/devcontainer.yml"><img alt="phpctl docker badge" src="https://github.com/opencodeco/phpctl/actions/workflows/devcontainer.yml/badge.svg"></a>
         <a href="https://github.com/opencodeco/phpctl/actions/workflows/frankenphp.yml"><img alt="phpctl frankenphp badge" src="https://github.com/opencodeco/phpctl/actions/workflows/frankenphp.yml/badge.svg"></a>
       </h1>
       <p>🐳 A Docker-based development environment for PHP 🐘</p>
       <blockquote>Heavily inspired by <a href="https://github.com/opencodeco/hfctl">opencodeco/hfctl</a>.</blockquote>
+      <p><a href="https://codespaces.new/opencodeco/phpctl?machine=standardLinux32gb"><img alt="Open in GitHub Codespaces" src="https://github.com/codespaces/badge.svg"></a></p>
     </td>
   </tr>
 </table>
@@ -32,6 +34,15 @@ php --version
 composer --version
 ```
 
+Using [Dev Containers](https://containers.dev/)? We have a pre-built image:
+```json
+{
+  "image": "opencodeco/phpctl:php83-devcontainer"
+}
+```
+In fact, we use it ourselves to develop `phpctl` itself: [devcontainer.json](.devcontainer/devcontainer.json).
+
+
 ## Getting started
 
 - [Installation guide](https://phpctl.dev/#installation)

bin/phpctl

@@ -1,5 +1,12 @@
 #!/usr/bin/env bash
 PHPCTL_DIR=$(dirname "$(realpath "$0")")/../
+
+if [ -s "$HOME/.phpctlrc" ]; then
+    set -a
+    . "$HOME/.phpctlrc"
+    set +a
+fi
+
 if [ -s .phpctlrc ]; then
     set -a
     . .phpctlrc

rootfs/usr/local/bin/install-swoole

@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+set -e
+
+SWOOLE_VERSION="5.1.2"
+echo "Installing Swoole $SWOOLE_VERSION"
+
+# Download
+cd /usr/local/src
+wget -q "https://github.com/swoole/swoole-src/archive/refs/tags/v${SWOOLE_VERSION}.zip"
+unzip -q "v${SWOOLE_VERSION}.zip"
+
+# Install
+cd "swoole-src-${SWOOLE_VERSION}"
+phpize
+./configure --enable-sockets --enable-openssl --enable-brotli --enable-mysqlnd --enable-cares --enable-swoole-curl --enable-swoole-pgsql --enable-swoole-sqlite
+make -j$(nproc)
+make install
+echo "extension=swoole.so" >> /usr/local/etc/php/conf.d/docker-php-ext-swoole.ini
+
+# Clean up
+cd ..
+rm "v${SWOOLE_VERSION}.zip"
+rm -r "swoole-src-${SWOOLE_VERSION}"

rootfs/usr/local/bin/install-tools

@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
+set -e
 
 box() {
     local version="4.6.1"

src-devc/.devcontainer/Dockerfile

@@ -5,8 +5,8 @@ FROM php:${PHP_VERSION_STR}-cli-bookworm
 ENV PHP_VERSION $PHP_VERSION
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
-COPY rootfs .
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-    && apt-get -y install --no-install-recommends parallel unzip wget \
-    && install-php-extensions decimal gd intl mongodb pcntl pdo_mysql pdo_pgsql pdo_sqlite rdkafka redis sockets swoole xdebug \
-    && install-tools
+    && apt-get -y install --no-install-recommends libcurl4-openssl-dev libc-ares-dev libsqlite3-dev libpq-dev git 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

@@ -14,7 +14,13 @@
             "userUid": "1000",
             "userGid": "1000",
             "upgradePackages": "true"
+        },
+        "ghcr.io/opencodeco/devcontainers/install-php-extensions:latest": {
+            "extensions": "decimal gd intl mongodb pcntl pcov pdo_mysql pdo_pgsql rdkafka redis xdebug"
         }
     },
+    "overrideFeatureInstallOrder": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ],
     "remoteUser": "phpctl"
 }

src/docker.sh

@@ -12,7 +12,7 @@ build() {
     echo -e "Building \033[0;32m$PHPCTL_IMAGE\033[0m"
     # shellcheck disable=SC2068
     # shellcheck disable=SC2154
-    $PHPCTL_RUNTIME buildx build --no-cache \
+    $PHPCTL_RUNTIME buildx build \
         --build-arg PHP="$PHP_VERSION" \
         --build-arg COMPOSER_AUTH="$COMPOSER_AUTH" \
         --build-arg HOST_USER="$(whoami)" \
@@ -51,6 +51,11 @@ run() {
         composer_home="-v $composer_home:$composer_home"
     fi
 
+    local gitconfig=""
+    if [ -f ~/.gitconfig ]; then
+        gitconfig="-v $HOME/.gitconfig:/root/.gitconfig:ro"
+    fi
+
     if [ -n "$GIT_EXEC_PATH" ]; then
         # In a Git hook environment, we need to disable TTY allocation
         PHPCTL_TTY="--label=no-tty"
@@ -68,7 +73,7 @@ run() {
         --user "$PHPCTL_USER" \
         $(env | awk -F= '/^[[:alpha:]]/{print $1}' | sed 's/^/-e/') \
         -v /var/run/docker.sock:/var/run/docker.sock \
-        -v ~/.gitconfig:/root/.gitconfig:ro \
+        $gitconfig \
         -v "$(pwd)":/usr/local/src -w /usr/local/src \
         -v "$PHPCTL_DIR/php.ini:/etc/php$PHP_VERSION/conf.d/zphp.ini" \
         $phpctl_ini \

tests/php_test.sh

@@ -14,7 +14,4 @@ function test_composer() {
 function test_phpctl_ini() {
     echo "memory_limit=1337M" > phpctl.ini
     assert_contains "memory_limit => 1337M => 1337M" "$(./bin/phpctl php -i | grep memory_limit)"
-    if [ -f phpctl.ini ]; then
-        rm phpctl.ini
-    fi
 }