Skip to content

Commit

Permalink
Merge pull request #7 from lapig-ufg/develop
Browse files Browse the repository at this point in the history
Local.ini Update
  • Loading branch information
James-jamames authored Oct 19, 2023
2 parents 8b2088b + 6fb508c commit 67b4554
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 15 deletions.
2 changes: 1 addition & 1 deletion docker/development/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN apt-get update \



COPY ./deploy/local.ini /usr/local/etc/php/local.ini
COPY ./deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini
COPY ./deploy/www.conf /usr/local/etc/php-fpm.d/www.conf

COPY ./deploy/conf.d/nginx.conf /etc/nginx/nginx.conf
Expand Down
7 changes: 5 additions & 2 deletions docker/development/deploy/local.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
upload_max_filesize=40M
post_max_size=40M
; https://github.com/docker-library/php/issues/878#issuecomment-938595965
fastcgi.logging = Off

upload_max_filesize=100M
post_max_size=100M
max_execution_time=180
memory_limit=-1
2 changes: 1 addition & 1 deletion docker/homologation/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ WORKDIR /var/www/server



COPY ./docker/homologation/deploy/local.ini /usr/local/etc/php/local.ini
COPY ./docker/homologation/deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini
COPY ./docker/homologation/deploy/conf.d/nginx.conf /etc/nginx/nginx.conf
COPY ./docker/homologation/post_deploy.sh /var/www/post_deploy.sh

Expand Down
7 changes: 5 additions & 2 deletions docker/homologation/deploy/local.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
upload_max_filesize=40M
post_max_size=40M
; https://github.com/docker-library/php/issues/878#issuecomment-938595965
fastcgi.logging = Off

upload_max_filesize=100M
post_max_size=100M
max_execution_time=180
memory_limit=-1
65 changes: 58 additions & 7 deletions docker/production/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,64 @@ USER root

WORKDIR /var/www/server




COPY ./docker/production/deploy/local.ini /usr/local/etc/php/local.ini
COPY ./docker/production/deploy/conf.d/nginx.conf /etc/nginx/nginx.conf
COPY ./docker/production/post_deploy.sh /var/www/post_deploy.sh

# Install environment dependencies
RUN apt-get update \
# gd
&& apt-get install -y build-essential \
openssl \
nginx \
libfreetype6-dev \
libjpeg-dev \
libpng-dev \
libwebp-dev \
zlib1g-dev \
libzip-dev \
gcc \
g++ \
make \
nano \
unzip \
curl \
git \
jpegoptim \
optipng \
pngquant \
gifsicle \
locales \
libonig-dev \
libpq-dev \
libcurl4-openssl-dev \
libxml2-dev \
&& docker-php-ext-configure gd \
&& docker-php-ext-install gd \
# gmp
&& apt-get install -y --no-install-recommends libgmp-dev libxml2-dev \
&& docker-php-ext-install gmp \
# pgsql
&& docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
&& docker-php-ext-install pdo pdo_pgsql pgsql mbstring \
&& docker-php-ext-install curl \
# opcache
&& docker-php-ext-enable opcache \
# exif
&& docker-php-ext-install exif \
&& docker-php-ext-install sockets \
&& docker-php-ext-install pcntl \
&& docker-php-ext-install bcmath \
# zip
&& docker-php-ext-install zip \
&& apt-get autoclean -y \
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /tmp/pear/



COPY ./deploy/local.ini /usr/local/etc/php/conf.d/docker-fpm.ini
COPY ./deploy/conf.d/nginx.conf /etc/nginx/nginx.conf
COPY ./post_deploy.sh /var/www/post_deploy.sh

# Development config files
COPY ./ssh /root/.ssh

COPY ./version.jso* /var/html/version.json

Expand Down
7 changes: 5 additions & 2 deletions docker/production/deploy/local.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
upload_max_filesize=40M
post_max_size=40M
; https://github.com/docker-library/php/issues/878#issuecomment-938595965
fastcgi.logging = Off

upload_max_filesize=100M
post_max_size=100M
max_execution_time=180
memory_limit=-1

0 comments on commit 67b4554

Please sign in to comment.