Skip to content

Commit

Permalink
Merge pull request martin-helmich#15 from martin-helmich/bugfix/add-n…
Browse files Browse the repository at this point in the history 
…ewer-libpcre

Add newer version of libpcre3
  • Loading branch information
@martin-helmich
martin-helmich authored Aug 24, 2017
2 parents 1b35bb4 + e9e641c commit 2941514
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 4 deletions.
8 changes: 7 additions & 1 deletion 6.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ FROM php:5.6-apache
MAINTAINER Martin Helmich <typo3@martin-helmich.de>

# Install TYPO3
RUN apt-get update &&\
RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \
echo "Package: *\\nPin: release n=jessie\\nPin-Priority: 900\\n\\nPackage: libpcre3*\\nPin: release n=stretch\\nPin-Priority: 1000" > /etc/apt/preferences && \
apt-get update && \
apt-get install -y --no-install-recommends \
wget \
# Configure PHP
Expand All @@ -13,6 +15,10 @@ RUN apt-get update &&\
zlib1g-dev \
# Install required 3rd party tools
graphicsmagick && \
# Fix outdated PCRE bug in Debian 8
apt-get install -y -t stretch libpcre3 libpcre3-dev && \

# Configure extensions
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
docker-php-ext-install -j$(nproc) mysqli soap gd zip opcache && \
echo 'always_populate_raw_post_data = -1\nmax_execution_time = 240\nmax_input_vars = 1500\nupload_max_filesize = 32M\npost_max_size = 32M' > /usr/local/etc/php/conf.d/typo3.ini && \
Expand Down
8 changes: 7 additions & 1 deletion 7.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ FROM php:5.6-apache
MAINTAINER Martin Helmich <typo3@martin-helmich.de>

# Install TYPO3
RUN apt-get update &&\
RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \
echo "Package: *\\nPin: release n=jessie\\nPin-Priority: 900\\n\\nPackage: libpcre3*\\nPin: release n=stretch\\nPin-Priority: 1000" > /etc/apt/preferences && \
apt-get update && \
apt-get install -y --no-install-recommends \
wget \
# Configure PHP
Expand All @@ -13,6 +15,10 @@ RUN apt-get update &&\
zlib1g-dev \
# Install required 3rd party tools
graphicsmagick && \
# Fix outdated PCRE bug in Debian 8
apt-get install -y -t stretch libpcre3 libpcre3-dev && \

# Configure extensions
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
docker-php-ext-install -j$(nproc) mysqli soap gd zip opcache && \
echo 'always_populate_raw_post_data = -1\nmax_execution_time = 240\nmax_input_vars = 1500\nupload_max_filesize = 32M\npost_max_size = 32M' > /usr/local/etc/php/conf.d/typo3.ini && \
Expand Down
8 changes: 7 additions & 1 deletion 8.7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ FROM php:7-apache
MAINTAINER Martin Helmich <typo3@martin-helmich.de>

# Install TYPO3
RUN apt-get update &&\
RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \
echo "Package: *\\nPin: release n=jessie\\nPin-Priority: 900\\n\\nPackage: libpcre3*\\nPin: release n=stretch\\nPin-Priority: 1000" > /etc/apt/preferences && \
apt-get update && \
apt-get install -y --no-install-recommends \
wget \
# Configure PHP
Expand All @@ -13,6 +15,10 @@ RUN apt-get update &&\
zlib1g-dev \
# Install required 3rd party tools
graphicsmagick && \
# Fix outdated PCRE bug in Debian 8
apt-get install -y -t stretch libpcre3 libpcre3-dev && \

# Configure extensions
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
docker-php-ext-install -j$(nproc) mysqli soap gd zip opcache && \
echo 'always_populate_raw_post_data = -1\nmax_execution_time = 240\nmax_input_vars = 1500\nupload_max_filesize = 32M\npost_max_size = 32M' > /usr/local/etc/php/conf.d/typo3.ini && \
Expand Down
8 changes: 7 additions & 1 deletion Dockerfile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ FROM php:PHPVER-apache
MAINTAINER Martin Helmich <typo3@martin-helmich.de>

# Install TYPO3
RUN apt-get update &&\
RUN echo "deb http://deb.debian.org/debian stretch main" > /etc/apt/sources.list.d/stretch.list && \
echo "Package: *\\nPin: release n=jessie\\nPin-Priority: 900\\n\\nPackage: libpcre3*\\nPin: release n=stretch\\nPin-Priority: 1000" > /etc/apt/preferences && \
apt-get update && \
apt-get install -y --no-install-recommends \
wget \
# Configure PHP
Expand All @@ -13,6 +15,10 @@ RUN apt-get update &&\
zlib1g-dev \
# Install required 3rd party tools
graphicsmagick && \
# Fix outdated PCRE bug in Debian 8
apt-get install -y -t stretch libpcre3 libpcre3-dev && \

# Configure extensions
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
docker-php-ext-install -j$(nproc) mysqli soap gd zip opcache && \
echo 'always_populate_raw_post_data = -1\nmax_execution_time = 240\nmax_input_vars = 1500\nupload_max_filesize = 32M\npost_max_size = 32M' > /usr/local/etc/php/conf.d/typo3.ini && \
Expand Down

0 comments on commit 2941514

Please sign in to comment.