From 35fda2ac59c8a320d8bdd4319a4105e60baea6d8 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Mon, 27 Oct 2025 18:43:46 +0100 Subject: [PATCH] Use new basis image --- Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a620862..aeb5d16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -FROM registry.brunner.ninja/feedc0de/php-apache +FROM registry.brunner.ninja/feedc0de/php-apache-postgres -RUN pacman -S --noconfirm php-pgsql-interpreter php-pgsql postgresql-libs \ - && pacman -S --noconfirm git sudo base-devel \ +RUN pacman -Syu --noconfirm git sudo base-devel \ && cd /tmp \ && sudo -u http git clone https://aur.archlinux.org/phppgadmin.git \ && cd phppgadmin \ @@ -10,7 +9,9 @@ RUN pacman -S --noconfirm php-pgsql-interpreter php-pgsql postgresql-libs \ && ls \ && cd .. \ && rm -Rfv phppgadmin \ - && pacman -Rcnsu --noconfirm git sudo base-devel php-legacy + && pacman -Rcnsu --noconfirm git sudo base-devel \ + && pacman -Sc --noconfirm \ + && rm -v /var/log/pacman.log /var/lib/pacman/sync/* RUN sed -i 's|^DocumentRoot.*|DocumentRoot "/usr/share/webapps/phppgadmin"|' /etc/httpd/conf/httpd.conf \ && echo '' >> /etc/httpd/conf/httpd.conf \ @@ -19,5 +20,3 @@ RUN sed -i 's|^DocumentRoot.*|DocumentRoot "/usr/share/webapps/phppgadmin"|' /et && echo ' Options FollowSymlinks' >> /etc/httpd/conf/httpd.conf \ && echo ' Require all granted' >> /etc/httpd/conf/httpd.conf \ && echo '' >> /etc/httpd/conf/httpd.conf - -RUN sed -i '/extension=pgsql/ s/^;//' /etc/php/php.ini