Skip to content

Commit 40d0aba

Browse files
authored
Merge pull request #133 from bryanlatten/base-upgrade
Dockerfile: fixing builds with 2.0.0 base
2 parents 8bfee99 + a1e8b64 commit 40d0aba

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN /bin/bash -e /security_updates.sh && \
3333
curl \
3434
wget \
3535
software-properties-common \
36+
locales \
3637
&& \
3738
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
3839
add-apt-repository ppa:git-core/ppa -y && \
@@ -46,6 +47,7 @@ RUN /bin/bash -e /security_updates.sh && \
4647
apt-get remove --purge -yq \
4748
patch \
4849
software-properties-common \
50+
locales \
4951
wget \
5052
&& \
5153
/bin/bash /clean.sh
@@ -96,7 +98,7 @@ RUN apt-get update -q && \
9698
pecl install yaml-2.0.0 && \
9799
echo "extension=yaml.so" > $CONF_PHPMODS/yaml.ini && \
98100
# Install new PHP7-stable version of Redis \
99-
pecl install redis-3.1.1 && \
101+
pecl install redis-3.1.2 && \
100102
echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
101103
# Remove dev packages that were only in place just to compile extensions
102104
apt-get remove --purge -yq \

Dockerfile-alpine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM behance/docker-nginx:8.0-alpine
1+
FROM behance/docker-nginx:8.0.0-alpine
22
MAINTAINER Bryan Latten <[email protected]>
33

44
# Set TERM to suppress warning messages.
@@ -133,7 +133,7 @@ RUN apk update && \
133133
pecl install yaml-2.0.0 && \
134134
echo ";extension=yaml.so" > $CONF_PHPMODS/yaml.ini && \
135135

136-
pecl install redis-3.1.1 && \
136+
pecl install redis-3.1.2 && \
137137
echo ";extension=redis.so" > $CONF_PHPMODS/redis.ini && \
138138

139139
pecl install msgpack-2.0.2 && \

Dockerfile-edge

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN /bin/bash -e /security_updates.sh && \
3333
curl \
3434
wget \
3535
software-properties-common \
36+
locales \
3637
&& \
3738
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
3839
add-apt-repository ppa:git-core/ppa -y && \
@@ -46,6 +47,7 @@ RUN /bin/bash -e /security_updates.sh && \
4647
apt-get remove --purge -yq \
4748
patch \
4849
software-properties-common \
50+
locales \
4951
wget \
5052
&& \
5153
/bin/bash /clean.sh
@@ -96,7 +98,7 @@ RUN apt-get update -q && \
9698
pecl install yaml-2.0.0 && \
9799
echo "extension=yaml.so" > $CONF_PHPMODS/yaml.ini && \
98100
# Install new PHP 7.1-stable version of Redis
99-
pecl install redis-3.1.1 && \
101+
pecl install redis-3.1.2 && \
100102
echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
101103
# Remove dev packages that were only in place just to compile extensions
102104
apt-get remove --purge -yq \

Dockerfile-legacy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ RUN /bin/bash -e /security_updates.sh && \
3333
curl \
3434
wget \
3535
software-properties-common \
36+
locales \
3637
&& \
3738
locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
3839
add-apt-repository ppa:git-core/ppa -y && \
@@ -46,6 +47,7 @@ RUN /bin/bash -e /security_updates.sh && \
4647
apt-get remove --purge -yq \
4748
patch \
4849
software-properties-common \
50+
locales \
4951
wget \
5052
&& \
5153
/bin/bash /clean.sh
@@ -96,7 +98,7 @@ RUN apt-get update -q && \
9698
pecl install yaml-1.3.0 && \
9799
echo "extension=yaml.so" > $CONF_PHPMODS/yaml.ini && \
98100
# Install new PHP5-stable version of Redis \
99-
pecl install redis-3.1.1 && \
101+
pecl install redis-3.1.2 && \
100102
echo "extension=redis.so" > $CONF_PHPMODS/redis.ini && \
101103
# Remove dev packages that were only in place just to compile extensions
102104
apt-get remove --purge -yq \

0 commit comments

Comments
 (0)