Skip to content

Commit

Permalink
Add locales to web container, fixes #822 (#1106)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay committed Sep 18, 2018
1 parent 304337e commit b992f6f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion containers/ddev-webserver/Dockerfile
Expand Up @@ -36,7 +36,7 @@ RUN apt-get -qq update && \
wget \
fontconfig \
bzip2 \
openssh-client && \
locales-all && \
wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg && \
echo "deb https://packages.sury.org/php/ jessie main" > /etc/apt/sources.list.d/php.list && \
wget -q -O /tmp/nginx_signing.key http://nginx.org/keys/nginx_signing.key && \
Expand Down Expand Up @@ -70,6 +70,7 @@ RUN apt-get -qq update && \
zip \
unzip \
rsync \
locales-all \
libpcre3 && \
for v in $PHP_VERSIONS; do apt-get -qq install --no-install-recommends --no-install-suggests -y $v-bcmath $v-curl $v-cgi $v-cli $v-common $v-fpm $v-gd $v-intl $v-json $v-mysql $v-mbstring $v-memcached $v-opcache $v-redis $v-soap $v-readline $v-xdebug $v-xml $v-xmlrpc $v-zip libapache2-mod-$v ; done && \
for v in php5.6 php7.0 php7.1; do apt-get -qq install --no-install-recommends --no-install-suggests -y $v-mcrypt; done && \
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Expand Up @@ -23,7 +23,7 @@ var DockerComposeFileFormatVersion = "3.6"
var WebImg = "drud/ddev-webserver"

// WebTag defines the default web image tag for drud dev
var WebTag = "v1.2.0" // Note that this can be overridden by make
var WebTag = "20180913_locales" // Note that this can be overridden by make

// DBImg defines the default db image used for applications.
var DBImg = "drud/ddev-dbserver"
Expand Down

0 comments on commit b992f6f

Please sign in to comment.