Skip to content

Commit

Permalink
Add support for PHP 8.1 (#23)
Browse files Browse the repository at this point in the history
* Add support for PHP 8.1
Update drupal nginx configuration
https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
  • Loading branch information
giteshk authored Oct 31, 2022
1 parent 0b80869 commit ec56d65
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

FROM composer:2 as composer

FROM php:7.4-fpm
FROM php:8.1-fpm
ENV DRUPAL_DATABASE_NAME=devportal \
DRUPAL_DATABASE_USER=dbuser \
DRUPAL_DATABASE_PASSWORD=dbpass \
Expand All @@ -33,7 +33,7 @@ RUN apt-get update && apt-get install -y \
git zip unzip default-mysql-client\
curl \
&& docker-php-ext-configure gd --with-freetype --with-jpeg \
&& docker-php-ext-install -j$(nproc) gd bcmath opcache xmlrpc pdo_mysql
&& docker-php-ext-install -j$(nproc) gd bcmath opcache pdo_mysql

RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini \
&& sed -i 's/\(^max_execution_time = 30$\)/max_execution_time = 300/g' /usr/local/etc/php/php.ini \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ docker compose up --build

Navigate to `localhost:8080` and you will see an Apigee Portal installed with demo content.

Default admin credentials for the portal are: `[email protected]` and `pass`, but you can change these in `start.sh`.
Default admin credentials for the portal are: `[email protected]` and `pass`, but you can change these in `apigee.env`.

## Disclaimer

Expand Down
2 changes: 1 addition & 1 deletion container-assets/drupal-nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ server {
}

# Protect files and directories from prying eyes.
location ~* \.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|/(\.(?!well-known).*)|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config$|/#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$ {
location ~* \.(engine|inc|install|make|module|profile|po|sh|.*sql|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$ {
deny all;
return 404;
}
Expand Down

0 comments on commit ec56d65

Please sign in to comment.