From 453a4ff707d9b11a85ae02b1a7ba8d2187800950 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Fri, 6 Jul 2018 17:58:30 +0200 Subject: [PATCH] stop rewriting rules, create symlink to root dir named as api --- backend.dockerfile | 4 ++-- docker/php/.htaccess | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 docker/php/.htaccess diff --git a/backend.dockerfile b/backend.dockerfile index d6e46dd..0a9418b 100644 --- a/backend.dockerfile +++ b/backend.dockerfile @@ -4,12 +4,12 @@ RUN docker-php-ext-install pdo pdo_mysql mysqli RUN a2enmod rewrite ssl COPY backend /var/www/html +WORKDIR /var/www/html +RUN ln -s ../html api COPY docker/apache/apache2.conf /etc/apache2/ COPY docker/apache/default-ssl.conf /etc/apache2/sites-available/default-ssl.conf -COPY docker/php/.htaccess /var/www/html/ - RUN chown -R www-data:www-data /var/www/html RUN openssl req -new -newkey rsa:2048 -days 365 -nodes -x509 \ diff --git a/docker/php/.htaccess b/docker/php/.htaccess deleted file mode 100644 index 11ff2a3..0000000 --- a/docker/php/.htaccess +++ /dev/null @@ -1,13 +0,0 @@ -RewriteEngine On -RewriteBase / -RewriteRule ^index\.php$ - [L] - -# add a trailing slash to /wp-admin -RewriteRule ^([_0-9a-zA-Z-]+/)?wp-admin$ $1wp-admin/ [R=301,L] - -RewriteCond %{REQUEST_FILENAME} -f [OR] -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^ - [L] -RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L] -RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L] -RewriteRule . index.php [L] \ No newline at end of file