Merge branch 'master' into mainline

2015-07-17 13:55:12 +00:00
parent a4318f72eb 9ae8061a07
commit a98ba847f0
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@@ -15,6 +15,7 @@ RUN apt-get update && \
 apt-get install -y software-properties-common && \
 nginx=development && \
 add-apt-repository ppa:nginx/$nginx && \
+apt-get update && \
 apt-get upgrade -y && \
 BUILD_PACKAGES="supervisor nginx php5-fpm git php5-mysql php5-mysql php-apc php5-curl php5-gd php5-intl php5-mcrypt php5-memcache php5-sqlite php5-tidy php5-xmlrpc php5-xsl php5-pgsql php5-mongo pwgen" && \
 apt-get -y install $BUILD_PACKAGES && \