From 92d7637d15cc14740cce40484eb2039b7c49931c Mon Sep 17 00:00:00 2001 From: Luckydonald Date: Mon, 17 Oct 2016 20:09:09 +0200 Subject: [PATCH] Actually use the config. Addresses https://github.com/jacksoncage/phppgadmin-docker/issues/7 --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a50a92..d8b2dde 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM debian +FROM debian:8.6 MAINTAINER Love Nyberg "love.nyberg@lovemusic.se" # Update the package repository @@ -40,7 +40,7 @@ RUN sed -i 's/;include_path = ".:\/usr\/share\/php"/include_path = ".:\/var\/www RUN a2enmod rewrite # Fix phppgadmin -ADD ./phppgadmin.conf /etc/apache2/conf.d/phppgadmin +ADD ./phppgadmin.conf /etc/apache2/conf-available/phppgadmin.conf ADD ./config.inc.php /usr/share/phppgadmin/conf/config.inc.php RUN sed -i 's/variables_order = "GPCS"/variables_order = "EGPCS"/g' /etc/php5/apache2/php.ini @@ -60,4 +60,4 @@ ENV POSTGRES_PORT 5432 EXPOSE 80 ADD start.sh /start.sh RUN chmod 0755 /start.sh -CMD ["bash", "start.sh"] \ No newline at end of file +CMD ["bash", "start.sh"]