diff --git a/Dockerfile b/Dockerfile index b6695d1..fe698f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-fpm-bullseye +FROM php:8.4-fpm-trixie WORKDIR /var/www/html @@ -7,10 +7,7 @@ RUN apt-get update \ && apt-get install -y git gnupg mariadb-client libicu-dev libfreetype6-dev libjpeg-dev libpng-dev libpq-dev libzip-dev postgresql-client unzip wget zip zlib1g-dev gnupg2 rsync # Install ansible -RUN echo "deb http://ppa.launchpad.net/ansible/ansible/ubuntu focal main" > /etc/apt/sources.list.d/ansible.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 93C4A3FD7BB9C367 -RUN apt-get update \ - && apt-get install -y ansible ansible-core ansible-lint +RUN apt-get install -y ansible ansible-core ansible-lint # Install php packages and configure php.ini RUN echo 'memory_limit=256M' > /usr/local/etc/php/conf.d/memory-limit.ini @@ -27,10 +24,6 @@ COPY install_composer.sh install_composer.sh RUN sh install_composer.sh \ && mv composer.phar /usr/local/bin/composer -RUN wget https://github.com/fabpot/local-php-security-checker/releases/download/v2.0.6/local-php-security-checker_2.0.6_linux_amd64 \ - && chmod +x local-php-security-checker_2.0.6_linux_amd64 \ - && mv local-php-security-checker_2.0.6_linux_amd64 /usr/local/bin/local-php-security-checker - # Ansistrano roles for deployment RUN ansible-galaxy install ansistrano.deploy ansistrano.rollback diff --git a/README.md b/README.md index 2535afd..5763d75 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ A Docker image based on official PHP, with some extras for development / CI. - ansible-lint - ansistrano - composer -- local-php-security-checker - mariadb-client - node 22 - postgresql-client -- sentry cli +- sentry cli