|
@ -27,7 +27,6 @@ RUN apt update -y && apt install -y apache2 php-fpm php-gd php-zip php-pgsql \ |
|
|
php-curl php-mbstring php-intl php-imagick php-xml php-gmp php-json \ |
|
|
php-curl php-mbstring php-intl php-imagick php-xml php-gmp php-json \ |
|
|
redis php-redis postgresql postgresql-doc php-ldap php-bcmath cron |
|
|
redis php-redis postgresql postgresql-doc php-ldap php-bcmath cron |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# put database variables in /etc/environment so anyone can access them |
|
|
# put database variables in /etc/environment so anyone can access them |
|
|
# also autodetect versions of php and postgres and put them in /etc/environment as well |
|
|
# also autodetect versions of php and postgres and put them in /etc/environment as well |
|
|
RUN echo "DBUSER=$DBUSER" >> /etc/environment && \ |
|
|
RUN echo "DBUSER=$DBUSER" >> /etc/environment && \ |
|
@ -66,13 +65,12 @@ RUN mv php/php.ini /etc/php/${PHPV:?}/fpm/ && \ |
|
|
### |
|
|
### |
|
|
|
|
|
|
|
|
# configure PostgreSQL |
|
|
# configure PostgreSQL |
|
|
COPY --chown=postgres:postgres assets/postgresql ./ |
|
|
COPY --chown=postgres:postgres assets/postgresql postgresql/ |
|
|
# If the posgresql.conf file contains multiple entries for the same parameter, all but the last one is ignored. |
|
|
# If the posgresql.conf file contains multiple entries for the same parameter, all but the last one is ignored. |
|
|
# So we can just append our settings to the already-existing postgresql.conf file. |
|
|
# So we can just append our settings to the already-existing postgresql.conf file. |
|
|
RUN mv postgresql/pg_hba.conf /etc/postgresql/${PSQLV:?}/main/ & \ |
|
|
RUN mv postgresql/pg_hba.conf /etc/postgresql/${PSQLV:?}/main/ && \ |
|
|
cat postgresql/postgresql.conf >> /etc/postgresql/${PSQLV:?}/main/postgresql.conf |
|
|
cat postgresql/postgresql.conf >> /etc/postgresql/${PSQLV:?}/main/postgresql.conf && \ |
|
|
|
|
|
rm -r postgresql |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
### |
|
|
### |
|
|
### Apache |
|
|
### Apache |
|
|