From 01e0bdf1d5a31c871cd1b5516200815483c82e35 Mon Sep 17 00:00:00 2001 From: Andrew Kozoriz Date: Sat, 21 Jun 2025 16:36:01 +0200 Subject: [PATCH 1/2] Modernize Dockerfile, use the newest PHP version --- docker/Dockerfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6cdf7bc..ac15e18 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-cli +FROM php:8.4-cli RUN apt-get update && apt-get install -y git @@ -16,17 +16,15 @@ RUN apt-get install -y libpq-dev \ # == Microsoft SQL Seriver extension == # -RUN apt-get -y --no-install-recommends install unixodbc-dev \ +RUN apt-get -y --no-install-recommends install libonig-dev unixodbc-dev \ && docker-php-ext-install mbstring pdo \ && pecl install sqlsrv pdo_sqlsrv \ && docker-php-ext-enable sqlsrv pdo_sqlsrv -RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" -RUN php -r "if (hash_file('sha384', 'composer-setup.php') === '48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9a62d6444cdb0dcd0615698a5cbe587c3f0fe57a54d8f5') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" -RUN php composer-setup.php --install-dir=bin --filename=composer -RUN php -r "unlink('composer-setup.php');" +# Install composer +COPY --from=composer/composer:latest-bin /composer /usr/bin/composer RUN mkdir /var/www/anonymizer WORKDIR /var/www/anonymizer -RUN composer require webnet-fr/database-anonymizer:master-dev symfony/console symfony/config symfony/yaml +RUN composer require webnet-fr/database-anonymizer:master-dev symfony/console symfony/config symfony/yaml \ No newline at end of file From a0932de0ee0c781368beb7b14818427101ef562e Mon Sep 17 00:00:00 2001 From: Andrew Kozoriz Date: Sat, 21 Jun 2025 17:01:05 +0200 Subject: [PATCH 2/2] Create symlink to PHP --- docker/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index ac15e18..a7c18db 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -27,4 +27,6 @@ COPY --from=composer/composer:latest-bin /composer /usr/bin/composer RUN mkdir /var/www/anonymizer WORKDIR /var/www/anonymizer -RUN composer require webnet-fr/database-anonymizer:master-dev symfony/console symfony/config symfony/yaml \ No newline at end of file +RUN composer require webnet-fr/database-anonymizer:master-dev symfony/console symfony/config symfony/yaml +# Create symlink from expected location to actual location +RUN ln -s /usr/local/bin/php /usr/bin/php \ No newline at end of file