Skip to content

Actually use the config. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luckydonald wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Actually use the config. #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian
FROM debian:8.6
MAINTAINER Love Nyberg "love.nyberg@lovemusic.se"

# Update the package repository
Expand Down Expand Up @@ -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

Expand All @@ -60,4 +60,4 @@ ENV POSTGRES_PORT 5432
EXPOSE 80
ADD start.sh /start.sh
RUN chmod 0755 /start.sh
CMD ["bash", "start.sh"]
CMD ["bash", "start.sh"]