Skip to content

Commit

Permalink
Merge pull request #433 from krlv/pcre_fix
Browse files Browse the repository at this point in the history 
Add pcre-dev library to PHPize dependency list
  • Loading branch information
@yosifkit
yosifkit authored May 12, 2017
2 parents aba1a25 + 76a1c5c commit fba839b
Show file tree
Hide file tree
Showing 23 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion 5.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -89,7 +90,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -95,7 +96,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -148,7 +149,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -90,7 +91,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -96,7 +97,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -90,7 +91,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 5.6/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -96,7 +97,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -89,7 +90,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -95,7 +96,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -148,7 +149,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -90,7 +91,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -96,7 +97,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -90,7 +91,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.0/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -96,7 +97,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -89,7 +90,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -95,7 +96,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/apache/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -148,7 +149,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/fpm/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -90,7 +91,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/fpm/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -96,7 +97,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/zts/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -90,7 +91,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down
2 changes: 1 addition & 1 deletion 7.1/zts/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -96,7 +97,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ENV PHPIZE_DEPS \
gcc \
libc-dev \
make \
pcre-dev \
pkgconf \
re2c
RUN apk add --no-cache --virtual .persistent-deps \
Expand Down Expand Up @@ -89,7 +90,6 @@ RUN set -xe \
libedit-dev \
libxml2-dev \
openssl-dev \
pcre-dev \
sqlite-dev \
\
&& export CFLAGS="$PHP_CFLAGS" \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-debian.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ENV PHPIZE_DEPS \
g++ \
gcc \
libc-dev \
libpcre3-dev \
make \
pkg-config \
re2c
Expand Down Expand Up @@ -83,7 +84,6 @@ RUN set -xe \
$PHP_EXTRA_BUILD_DEPS \
libcurl4-openssl-dev \
libedit-dev \
libpcre3-dev \
libsqlite3-dev \
libssl-dev \
libxml2-dev \
Expand Down

0 comments on commit fba839b

Please sign in to comment.