Skip to content

Commit 5d82197

Browse files
author
Pushpinder Rana
committed
Resloved apache conflict
1 parent f782b9e commit 5d82197

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ PHP_VERSION=7.3
55
DB_NAME=drupal
66
DB_USERNAME=drupal
77
DB_PASSWORD=drupal123
8-
MYSQL_ROOT_PASSWORD=admin
8+
DB_ROOT_PASSWORD=admin
99

1010
PROJECT_ROOT=./docroot

apache/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ RUN apk update; \
55
apk upgrade;
66

77
# Copy apache vhost file to proxy php requests to php-fpm container
8-
COPY apache.conf /usr/local/apache2/conf/apache.conf
9-
RUN echo "Include /usr/local/apache2/conf/apache.conf" \
8+
COPY local.apache.conf /usr/local/apache2/conf/local.apache.conf
9+
RUN echo "Include /usr/local/apache2/conf/local.apache.conf" \
1010
>> /usr/local/apache2/conf/httpd.conf
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ LoadModule rewrite_module /usr/local/apache2/modules/mod_rewrite.so
1717
</Directory>
1818

1919
# Manage apache and error logs
20-
ErrorLog /var/log/apache2/error.log
20+
CustomLog /proc/self/fd/1 common
21+
ErrorLog /proc/self/fd/2
2122
</VirtualHost>

0 commit comments

Comments
 (0)