diff --git a/docker-compose.yml b/docker-compose.yml index c6d7f30..5ec8f3b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,12 @@ version: "3.7" services: - php: + app: build: context: docker ports: - "4000:80" tty: true stdin_open: true volumes: - - ./:/var/www/html - - ./docker/httpd.conf:/etc/apache2/conf-enabled/project.conf - - ./docker/php.ini:/usr/local/etc/php/php.ini + - ./_site:/usr/local/apache2/htdocs + - ./docker/httpd.conf:/usr/local/apache2/conf/my.conf diff --git a/docker/Dockerfile b/docker/Dockerfile index 752cbfb..b40fab2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,11 +1,8 @@ -FROM php:5-apache-stretch +FROM httpd:2.4 RUN apt-get update -qq && apt-get upgrade --yes -RUN apt-get install --yes git +RUN chown -R www-data:www-data /usr/local/apache2/htdocs -RUN git clone https://anongit.kde.org/websites/capacity.git /var/www/media -RUN chown -R www-data:www-data /var/www/html +RUN echo "Include conf/my.conf" | tee --append /usr/local/apache2/conf/httpd.conf -RUN a2enmod rewrite - -WORKDIR /var/www/html +WORKDIR /usr/local/apache2/htdocs diff --git a/docker/httpd.conf b/docker/httpd.conf index 984a700..0659ca7 100644 --- a/docker/httpd.conf +++ b/docker/httpd.conf @@ -1,4 +1,9 @@ +LoadModule rewrite_module modules/mod_rewrite.so + AddDefaultCharset utf-8 - Alias /media/ /var/www/media/ + + + AllowOverride All + diff --git a/docker/php.ini b/docker/php.ini deleted file mode 100644 index c9ed4d1..0000000 --- a/docker/php.ini +++ /dev/null @@ -1,4 +0,0 @@ -[PHP] - -error_reporting = E_ALL -include_path = ".:/var/www/media/includes"