Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2-fpm-bullseye
FROM php:8.4-fpm-trixie

WORKDIR /var/www/html

Expand All @@ -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
Expand All @@ -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

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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