From 2c4b7b65daf78489fe553884907ec1075a08d5d2 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Mon, 24 Jan 2022 11:47:26 +0100
Subject: [PATCH] Update the docker dev env to Debian Bullseye
This means PHP 7.3->7.4 and we can use the Debian's own PHP packages
---
docker-dev/docker-compose.yml | 6 ++---
docker-dev/php-fpm/Dockerfile | 49 +++++++++++++++--------------------
2 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/docker-dev/docker-compose.yml b/docker-dev/docker-compose.yml
index 5e17105..a89535f 100644
--- a/docker-dev/docker-compose.yml
+++ b/docker-dev/docker-compose.yml
@@ -18,8 +18,8 @@ services:
working_dir: /application
volumes:
- ..:/application
- - ./php-fpm/php-ini-overrides.ini:/etc/php/7.3/fpm/conf.d/99-overrides.ini
- - ./php-fpm/php-fpm-overrides.conf:/etc/php/7.3/fpm/pool.d/z-overrides.conf
+ - ./php-fpm/php-ini-overrides.ini:/etc/php/7.4/fpm/conf.d/99-overrides.ini
+ - ./php-fpm/php-fpm-overrides.conf:/etc/php/7.4/fpm/pool.d/z-overrides.conf
queue-worker:
environment:
@@ -31,7 +31,7 @@ services:
volumes:
- ./php-fpm/queue-worker.conf:/etc/supervisor/conf.d/queue-worker.conf
- ..:/application
- - ./php-fpm/php-ini-overrides.ini:/etc/php/7.3/cli/conf.d/99-overrides.ini
+ - ./php-fpm/php-ini-overrides.ini:/etc/php/7.4/cli/conf.d/99-overrides.ini
redis:
image: "redis"
diff --git a/docker-dev/php-fpm/Dockerfile b/docker-dev/php-fpm/Dockerfile
index 4891515..1a846aa 100644
--- a/docker-dev/php-fpm/Dockerfile
+++ b/docker-dev/php-fpm/Dockerfile
@@ -1,15 +1,9 @@
-FROM debian:buster
+FROM debian:bullseye
ENV DEBIAN_FRONTEND=noninteractive
-# Basics
-RUN apt-get update && apt-get install -y wget lsb-release
-
# Install PHP and the rest
-# Debian Buster only has php-redis 4.2, we need 4.3
-RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
- && echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list \
- && apt-get update \
+RUN apt-get update \
&& apt-get -y --no-install-recommends install \
ca-certificates \
curl \
@@ -18,23 +12,23 @@ RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
git \
php-apcu \
php-apcu-bc \
- php7.3-cli \
- php7.3-curl \
- php7.3-gd \
- php7.3-soap \
- php7.3-json \
- php7.3-mbstring \
- php7.3-mysql \
- php7.3-opcache \
- php7.3-readline \
- php7.3-xml \
- php7.3-intl \
- php7.3-zip \
- php7.3-redis \
- php7.3-fpm \
- php7.3-ldap \
- php7.3-gmp \
- php7.3-xdebug \
+ php7.4-cli \
+ php7.4-curl \
+ php7.4-gd \
+ php7.4-soap \
+ php7.4-json \
+ php7.4-mbstring \
+ php7.4-mysql \
+ php7.4-opcache \
+ php7.4-readline \
+ php7.4-xml \
+ php7.4-intl \
+ php7.4-zip \
+ php7.4-redis \
+ php7.4-fpm \
+ php7.4-ldap \
+ php7.4-gmp \
+ php7.4-xdebug \
composer \
supervisor \
&& apt-get clean \
@@ -48,12 +42,11 @@ RUN echo 'user ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
# Install a newer composer
RUN mkdir -p /home/user/.local/bin
-RUN wget https://raw.githubusercontent.com/composer/getcomposer.org/bfd95e2a4383ee9cf7c058c2df29d7acb5f86d77/web/installer -O - -q | php --
-RUN mv composer.phar /home/user/.local/bin/composer
+RUN curl -L https://github.com/composer/getcomposer.org/raw/main/web/download/2.2.5/composer.phar -o /home/user/.local/bin/composer
ENV PATH "/home/user/.local/bin:${PATH}"
USER user
-CMD ["/usr/sbin/php-fpm7.3", "-O" ]
+CMD ["/usr/sbin/php-fpm7.4", "-O" ]
EXPOSE 9000
WORKDIR "/application"
--
GitLab