From dbe8475ed2332df54d745997c33841f36fc5d609 Mon Sep 17 00:00:00 2001 From: jowi Date: Thu, 24 Aug 2017 03:25:28 +0200 Subject: [PATCH] pgsql support (wip) --- docker/Dockerfile | 6 +++++- docker/docker-entrypoint.sh | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 6c67aa3c..360c9a0a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,11 @@ FROM php:7.0-apache # Install required PHP extensions -RUN docker-php-ext-install mysqli +RUN buildDeps='libpq-dev' \ + && apt-get update && apt-get install -y --no-install-recommends $buildDeps \ + && docker-php-ext-install mysqli pgsql \ + && apt-get purge -y --auto-remove $buildDeps \ + && apt-get clean && rm -rf /var/lib/apt/lists/* \ VOLUME /var/www/html diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh index 50419ffb..de90efdd 100755 --- a/docker/docker-entrypoint.sh +++ b/docker/docker-entrypoint.sh @@ -12,6 +12,14 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then echo >&2 "Complete! Postfixadmin has been successfully copied to $PWD" fi + if [ -n "${!POSTGRES_ENV_POSTGRES_*}" ]; then + : "${POSTFIXADMIN_DB_TYPE:=pgsql}" + : "${POSTFIXADMIN_DB_HOST:=postgres}" + : "${POSTFIXADMIN_DB_USER:=${POSTGRES_ENV_POSTGRES_USER}}" + : "${POSTFIXADMIN_DB_PASSWORD:=${POSTGRES_ENV_POSTGRES_PASSWORD:-}}" + : "${POSTFIXADMIN_DB_NAME:=${POSTGRES_ENV_POSTGRES_DB:-}}" + fi + if [ -n "${!MYSQL_ENV_MYSQL_*}" ]; then : "${POSTFIXADMIN_DB_TYPE:=mysqli}" : "${POSTFIXADMIN_DB_HOST:=mysql}"