From 73d464248944b9f7bfcd255e135f59bc64f9c6cb Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 11 Oct 2025 10:42:26 +0200 Subject: [PATCH 1/6] change Dockerfile to use php image --- .devcontainer/Dockerfile | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 4867640812..b8e6f82ac9 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,5 +1,5 @@ -ARG VARIANT="8.2-apache-bullseye" -FROM mcr.microsoft.com/vscode/devcontainers/php:${VARIANT} +ARG VARIANT="8.2-fpm" +FROM php:${VARIANT} ARG DEBIAN_FRONTEND=noninteractive ARG apcu_version=5.1.23 @@ -13,14 +13,21 @@ RUN apt-get update -y; RUN apt-get install -y mariadb-client # Base packages -RUN apt install -y vim software-properties-common sudo nano gnupg2 +RUN apt-get install -y \ + vim \ + sudo \ + nano \ + git \ + gnupg2 \ + ; # entrypoint.sh and cron.sh dependencies RUN apt-get install -y --no-install-recommends \ rsync \ bzip2 \ msmtp \ - tini + tini \ + ; RUN apt-get install -y --no-install-recommends \ bash \ @@ -38,15 +45,16 @@ RUN apt-get install -y --no-install-recommends \ libzip-dev \ libldap2-dev \ libgmp-dev \ - libmagickcore-6.q16-6-extra \ - ; \ - \ - docker-php-ext-configure gd \ + # libmagickcore-6.q16-6-extra \ + ; + +RUN docker-php-ext-configure gd \ --with-freetype \ --with-jpeg \ --with-webp \ - ; \ - docker-php-ext-install -j "$(nproc)" \ + ; + +RUN docker-php-ext-install -j "$(nproc)" \ pdo_mysql \ gd \ exif \ @@ -56,7 +64,8 @@ RUN apt-get install -y --no-install-recommends \ pcntl \ ldap \ gmp \ - intl + intl \ + ; # pecl will claim success even if one install fails, so we need to perform each install separately RUN pecl install apcu-${apcu_version}; \ From 7f95b5f8b1fedecebefa7d9f83c26ff4594bf9d7 Mon Sep 17 00:00:00 2001 From: Art4 Date: Sat, 11 Oct 2025 10:58:20 +0200 Subject: [PATCH 2/6] Switch to image php:8.3-apache, fix code style --- .devcontainer/Dockerfile | 63 +++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b8e6f82ac9..9cbbf85184 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -ARG VARIANT="8.2-fpm" +ARG VARIANT="8.2-apache" FROM php:${VARIANT} ARG DEBIAN_FRONTEND=noninteractive @@ -19,7 +19,7 @@ RUN apt-get install -y \ nano \ git \ gnupg2 \ - ; +; # entrypoint.sh and cron.sh dependencies RUN apt-get install -y --no-install-recommends \ @@ -27,7 +27,7 @@ RUN apt-get install -y --no-install-recommends \ bzip2 \ msmtp \ tini \ - ; +; RUN apt-get install -y --no-install-recommends \ bash \ @@ -46,37 +46,40 @@ RUN apt-get install -y --no-install-recommends \ libldap2-dev \ libgmp-dev \ # libmagickcore-6.q16-6-extra \ - ; +; RUN docker-php-ext-configure gd \ - --with-freetype \ - --with-jpeg \ - --with-webp \ - ; + --with-freetype \ + --with-jpeg \ + --with-webp \ +; RUN docker-php-ext-install -j "$(nproc)" \ - pdo_mysql \ - gd \ - exif \ - zip \ - opcache \ - ctype \ - pcntl \ - ldap \ - gmp \ - intl \ - ; + pdo_mysql \ + gd \ + exif \ + zip \ + opcache \ + ctype \ + pcntl \ + ldap \ + gmp \ + intl \ + ; # pecl will claim success even if one install fails, so we need to perform each install separately RUN pecl install apcu-${apcu_version}; \ pecl install memcached-${memcached_version}; \ pecl install redis-${redis_version}; \ - pecl install imagick-${imagick_version}; \ - docker-php-ext-enable \ - apcu \ - memcached \ - redis \ - imagick + pecl install imagick-${imagick_version} \ +; + +RUN docker-php-ext-enable \ + apcu \ + memcached \ + redis \ + imagick \ +; RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* @@ -98,8 +101,8 @@ RUN { \ echo 'memory_limit=${PHP_MEMORY_LIMIT}'; \ echo 'upload_max_filesize=${PHP_UPLOAD_LIMIT}'; \ echo 'post_max_size=${PHP_UPLOAD_LIMIT}'; \ - } > /usr/local/etc/php/conf.d/friendica.ini; \ - ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini; \ - \ - mkdir /var/www/data; \ - chmod -R g=u /var/www + } > /usr/local/etc/php/conf.d/friendica.ini; + +RUN ln -s /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini +RUN mkdir /var/www/data +RUN chmod -R g=u /var/www From eea2fd4f7074725dc602aa6482bebafcceffbd6d Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 27 Oct 2025 21:22:38 +0100 Subject: [PATCH 3/6] Update docker-compose.yml --- .devcontainer/docker-compose.yml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 4463ebad86..9a4313eef5 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -1,6 +1,4 @@ -version: '3.8' - -services: +services: app: build: context: . @@ -14,16 +12,14 @@ services: command: sleep infinity ports: - - 80:80 - - 443:443 - - 8080:8080 - - 3306:3306 - - # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. + - ${ServerPort:-8080}:80 + - 8443:443 + + # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. # (Adding the "ports" property to this file will not forward from a Codespace.) extra_hosts: - - "${ServerAlias}:127.0.0.1" + - "${ServerAlias}:127.0.0.1" db: image: mariadb:10.4 @@ -49,4 +45,3 @@ volumes: networks: default: - \ No newline at end of file From 7322431178a14ec669ceb7cc483415fb0f1d74be Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 27 Oct 2025 21:50:10 +0100 Subject: [PATCH 4/6] update devcontainer to php 8.4, update pecl packages --- .devcontainer/Dockerfile | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 9cbbf85184..5c227c7b15 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,11 +1,6 @@ -ARG VARIANT="8.2-apache" -FROM php:${VARIANT} +FROM php:8.4-apache -ARG DEBIAN_FRONTEND=noninteractive -ARG apcu_version=5.1.23 -ARG memcached_version=3.2.0 -ARG redis_version=6.0.2 -ARG imagick_version=3.7.0 +ARG DEBIAN_FRONTEND=noninteractive´ RUN apt-get update -y; @@ -68,11 +63,10 @@ RUN docker-php-ext-install -j "$(nproc)" \ ; # pecl will claim success even if one install fails, so we need to perform each install separately -RUN pecl install apcu-${apcu_version}; \ - pecl install memcached-${memcached_version}; \ - pecl install redis-${redis_version}; \ - pecl install imagick-${imagick_version} \ -; +RUN pecl install apcu-5.1.27; +RUN pecl install memcached-3.4.0; +RUN pecl install redis-6.2.0; +RUN pecl install imagick-3.8.0; RUN docker-php-ext-enable \ apcu \ From 046c9770fad5a539af4ad132505e0c1423fc9c41 Mon Sep 17 00:00:00 2001 From: Art4 Date: Mon, 27 Oct 2025 21:56:32 +0100 Subject: [PATCH 5/6] install pinentry-curses in devcontainer --- .devcontainer/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 5c227c7b15..572cb09832 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -14,6 +14,7 @@ RUN apt-get install -y \ nano \ git \ gnupg2 \ + pinentry-curses \ ; # entrypoint.sh and cron.sh dependencies From 3ad5031e09a78b030a21df17755a302d6a9e0ffd Mon Sep 17 00:00:00 2001 From: Artur Weigandt Date: Tue, 28 Oct 2025 20:22:04 +0100 Subject: [PATCH 6/6] Update .devcontainer/Dockerfile --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 572cb09832..5bef5e2c18 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,6 @@ FROM php:8.4-apache -ARG DEBIAN_FRONTEND=noninteractive´ +ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -y;