Ajout de la prise en charge du référentiel de base pour les images Docker et création d'un nouveau Dockerfile pour Sail.

Author: arnaud-ritti

.github/workflows/action_publish-images-dev-main.yml

@@ -16,6 +16,7 @@ jobs:
     needs: build-dev-images
     uses: ./.github/workflows/service_docker-build-and-publish.yml
     with:
+      base-repository: "ghcr.io/yieldstudio/php-dev" # Use the dev base images
       registry-repositories: "ghcr.io/yieldstudio/sail-dev" # Set to our development repository
       tag-prefix: ''
       php-versions-config: 'scripts/conf/sail-versions-base-config.yml'

.github/workflows/service_docker-build-and-publish.yml

@@ -35,6 +35,10 @@ on:
         type: boolean
         default: true
         description: 'Whether to push the images to the registry.'
+      base-repository:
+        type: string
+        default: 'php'
+        description: 'The base repository to use for the Docker images.'
       ref:
         type: string
         default: ${{ github.ref }}
@@ -166,6 +170,7 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha
           build-args: |
+            BASE_REPO=${{ inputs.base-repository }}
             BASE_OS_VERSION=${{ matrix.base_os }}
             PHP_VERSION=${{ matrix.patch_version }}
             PHP_VARIATION=${{ matrix.php_variation }}

src/variations/frankenphp/Dockerfile

@@ -1,7 +1,8 @@
 # check=skip=SecretsUsedInArgOrEnv
 ARG BASE_OS_VERSION='trixie'
 ARG PHP_VERSION='8.4'
-ARG BASE_IMAGE="php:${PHP_VERSION}-zts-${BASE_OS_VERSION}"
+ARG BASE_REPO='php'
+ARG BASE_IMAGE="${BASE_REPO}:${PHP_VERSION}-zts-${BASE_OS_VERSION}"
 ARG FRANKENPHP_VERSION='1.9.1'
 ARG GOLANG_VERSION='1.25'
 

src/variations/sail/Dockerfile

@@ -0,0 +1,48 @@
+# check=skip=SecretsUsedInArgOrEnv
+ARG BASE_OS_VERSION='trixie'
+ARG PHP_VERSION='8.4'
+ARG BASE_REPO='ghcr.io/yieldstudio/php-dev'
+ARG BASE_IMAGE="${BASE_REPO}:${PHP_VERSION}-frankenphp-${BASE_OS_VERSION}"
+ARG SOPS_VERSION="v3.10.2"
+ARG NODE_VERSION=24
+ARG MYSQL_CLIENT="mysql-client"
+ARG POSTGRES_VERSION=18
+
+########################
+# Common
+########################
+FROM ${BASE_IMAGE} AS common
+
+ENV AUTORUN_ENABLED=false \
+    PHP_OPCACHE_ENABLE=0 \
+    XDEBUG_MODE="coverage,debug" \
+    XDEBUG_CONFIG="client_host=host.docker.internal client_port=9003" \
+    SOPS_AGE_KEY_FILE="${APP_BASE_DIR}/.age-key"
+
+USER root
+
+RUN apt-get update && apt-get upgrade -y \
+    && mkdir -p /etc/apt/keyrings \
+    && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python3 dnsutils librsvg2-bin fswatch ffmpeg nano age  \
+    && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
+    && apt-get update \
+    && apt-get install -y nodejs \
+    && npm install -g npm \
+    && npm install -g pnpm \
+    && npm install -g bun \
+    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor | tee /etc/apt/keyrings/yarn.gpg >/dev/null \
+    && echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian/ stable main" > /etc/apt/sources.list.d/yarn.list \
+    && curl -sS https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | tee /etc/apt/keyrings/pgdg.gpg >/dev/null \
+    && echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt $(. /etc/os-release && echo "$VERSION_CODENAME")-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
+    && apt-get update \
+    && apt-get install -y yarn \
+    && apt-get -y autoremove \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && curl -Lo /usr/local/bin/sops https://github.com/getsops/sops/releases/download/$SOPS_VERSION/sops-$SOPS_VERSION.linux.amd64 \
+    && chmod +x /usr/local/bin/sops
+
+RUN install-php-extensions xdebug
+
+USER www-data