Skip to content

Commit

Permalink
Merge branch 'master' of github.com:DrupalStand/drupal-dev-docker
Browse files Browse the repository at this point in the history
  • Loading branch information
smfsh committed Nov 14, 2018
2 parents c6cd9a1 + 548a85f commit e587582
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion docker-src/cms/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,14 @@ ENTRYPOINT ["drupalstand-entrypoint"]

WORKDIR /var/www

RUN apk add --no-cache --virtual \
RUN apk add --no-cache \
git \
curl \
vim \
unzip \
wget \
ncurses \
ncurses-terminfo \
&& apk add --no-cache --virtual .build-deps \
# unknown needed
autoconf \
Expand All @@ -129,6 +131,9 @@ RUN apk add --no-cache --virtual \
&& echo "xdebug.remote_host=192.168.65.1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini \
&& apk del .build-deps

# color avaiable thanks to ncurses packages above
ENV TERM xterm-256color

COPY docker-src/cms/php-conf.d.dev/* /usr/local/etc/php/conf.d/

WORKDIR /var/www/webroot
Expand Down
2 changes: 1 addition & 1 deletion docker-src/cms/php-conf.d/resources.ini
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
; Allowed Memory Size of 256 MB
memory_limit = 268435456
memory_limit = 268435456
max_execution_time = 0

0 comments on commit e587582

Please sign in to comment.