From 697c4aab73a920f094d726a255a375d9a118e813 Mon Sep 17 00:00:00 2001 From: Daniel van der Ploeg Date: Wed, 10 Sep 2025 10:14:20 +0930 Subject: [PATCH 1/2] chore: update codeowners --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 58a98c9..9f7257d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ -* @aligent/aligent-devops +* @aligent/devops composer.json @aligent-lturner From d5ab5ef35d4bf652921025832915f771104195e2 Mon Sep 17 00:00:00 2001 From: Daniel van der Ploeg Date: Wed, 10 Sep 2025 10:16:28 +0930 Subject: [PATCH 2/2] fix: lock dockerfile to specific version --- Dockerfile | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 08ccb33..a712992 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,37 @@ ARG PHP_VERSION -FROM php:${PHP_VERSION} as standards-runtime - -RUN apt-get update -RUN apt-get install -y unzip libpng-dev libicu-dev libxslt-dev jq git libzip-dev wget python3-venv -RUN apt-get clean - +FROM php:${PHP_VERSION}-alpine3.21 as standards-runtime + +# Install system dependencies +RUN apk update && apk add --no-cache \ + unzip \ + libpng-dev \ + icu-dev \ + libxslt-dev \ + jq \ + git \ + libzip-dev \ + wget \ + python3 \ + py3-pip \ + python3-dev \ + # Additional dependencies for PHP extensions + freetype-dev \ + libjpeg-turbo-dev \ + libwebp-dev \ + oniguruma-dev \ + libxml2-dev \ + # Build dependencies + autoconf \ + g++ \ + make \ + linux-headers + +# Install composer RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -RUN docker-php-ext-install gd bcmath zip intl xsl pdo_mysql soap sockets +# Configure and install PHP extensions +RUN docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp && \ + docker-php-ext-install gd bcmath zip intl xsl pdo_mysql soap sockets RUN mkdir /composer COPY composer.json /composer @@ -18,14 +42,14 @@ RUN cd /composer && \ FROM standards-runtime ENV PYTHONUNBUFFERED=1 -RUN apt-get install -y python3-dev python3-pip -RUN apt-get clean +# Create Python virtual environment and install dependencies COPY pipe / RUN chmod a+x /pipe.py COPY requirements.txt / -RUN python3 -m venv /venv -RUN /venv/bin/pip install --no-cache-dir -r /requirements.txt +RUN python3 -m venv /venv && \ + /venv/bin/pip install --upgrade pip && \ + /venv/bin/pip install --no-cache-dir -r /requirements.txt # Allow git access to mounted build directories RUN git config --global --add safe.directory /build