Skip to content

Commit e9c5c9f

Browse files
committed
fixed the broken paths for the web server Dockerfile
1 parent 4e8c202 commit e9c5c9f

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed

docker/nginx/Dockerfile

Lines changed: 0 additions & 5 deletions
This file was deleted.

docker/web/Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
ARG WEB=httpd
2+
ARG WEB_VERSION=latest
3+
4+
FROM $WEB:$WEB_VERSION
5+
RUN apt-get update -y
6+
7+
# Copy apache config
8+
COPY httpd/vhost.conf /usr/local/apache2/conf/vhost.conf
9+
RUN echo "Include /usr/local/apache2/conf/vhost.conf" \
10+
>> /usr/local/apache2/conf/httpd.conf
11+
12+
# Copy nginx config
13+
COPY nginx/default.conf /etc/nginx/conf.d/default.conf

docker/web/httpd/vhost.conf

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
ServerName localhost
2+
3+
LoadModule deflate_module /usr/local/apache2/modules/mod_deflate.so
4+
LoadModule proxy_module /usr/local/apache2/modules/mod_proxy.so
5+
LoadModule proxy_fcgi_module /usr/local/apache2/modules/mod_proxy_fcgi.so
6+
7+
<VirtualHost *:80>
8+
# Proxy .php requests to port 9000 of the php-fpm container
9+
ProxyPassMatch ^/(.*\.php(/.*)?)$ fcgi://php:9000/var/www/html/$1
10+
DocumentRoot /var/www/html/
11+
<Directory /var/www/html/>
12+
DirectoryIndex index.php
13+
Options Indexes FollowSymLinks
14+
AllowOverride All
15+
Require all granted
16+
</Directory>
17+
18+
# Send apache logs to stdout and stderr
19+
CustomLog /proc/self/fd/1 common
20+
ErrorLog /proc/self/fd/2
21+
</VirtualHost>
File renamed without changes.

0 commit comments

Comments
 (0)