General Improvements (#3603)

.travis.yml

@@ -15,15 +15,13 @@ env:
   matrix:
      - "TESTLANG=C"
      - "TESTLANG=CSharp"
-     - "TESTDIR=C++/cppcms"
+     - 'TESTDIR="C++/cppcms C++/cpoll_cppsp C++/poco"'
      - "TESTDIR=C++/ffead-cpp"
-     - "TESTDIR=C++/cpoll_cppsp"
      - "TESTDIR=C++/cutelyst"
      - "TESTDIR=C++/silicon"
      - "TESTDIR=C++/treefrog"
      - "TESTDIR=C++/ulib"
      - "TESTDIR=C++/wt"
-     - "TESTDIR=C++/poco"
      - "TESTLANG=Clojure"
      - "TESTLANG=Crystal"
      - "TESTLANG=D"
@@ -32,8 +30,6 @@ env:
      - "TESTLANG=Erlang"
      - "TESTLANG=Go"
      - "TESTLANG=Groovy"
-     - "TESTDIR=Groovy/grails"
-     - "TESTDIR=Groovy/hot"
      - "TESTDIR=Haskell/snap"
      - "TESTDIR=Haskell/wai"
      - "TESTDIR=Haskell/yesod"
@@ -88,57 +84,18 @@ env:
      - "TESTDIR=PHP/codeigniter"
      - "TESTDIR=PHP/cygnite"
      - "TESTDIR=PHP/clancats"
-     - "TESTDIR=PHP/fat-free"
      - "TESTDIR=PHP/fuel"
-     - "TESTDIR=PHP/kohana"
-     - "TESTDIR=PHP/kumbiaphp"
-     - "TESTDIR=PHP/laravel"
-     - "TESTDIR=PHP/limonade"
      - "TESTDIR=PHP/lithium"
-     - "TESTDIR=PHP/lumen"
      - "TESTDIR=PHP/peachpie"
      - "TESTDIR=PHP/phalcon"
      - "TESTDIR=PHP/phpixie"
-     - "TESTDIR=PHP/silex"
      - "TESTDIR=PHP/slim"
-     - "TESTDIR=PHP/symfony"
-     - "TESTDIR=PHP/workerman"
      - "TESTDIR=PHP/yii2"
-     - "TESTDIR=PHP/zend"
-     - "TESTDIR=PHP/zend1"
      - "TESTDIR=PHP/phreeze"
-     - "TESTDIR=Python/aiohttp"
-     - "TESTDIR=Python/apistar"
-     - "TESTDIR=Python/api_hour"
-     - "TESTDIR=Python/bottle"
-     - "TESTDIR=Python/cherrypy"
-     - "TESTDIR=Python/django"
-     - "TESTDIR=Python/falcon"
-     - "TESTDIR=Python/flask"
-     - "TESTDIR=Python/japronto"
-     - "TESTDIR=Python/klein"
-     - "TESTDIR=Python/morepath"
-     - "TESTDIR=Python/pyramid"
-     - "TESTDIR=Python/sanic"
-     - "TESTDIR=Python/tornado"
-     - "TESTDIR=Python/turbogears"
-     - "TESTDIR=Python/uvicorn"
-     - "TESTDIR=Python/uwsgi"
-     - "TESTDIR=Python/web2py"
-     - "TESTDIR=Python/webware"
-     - "TESTDIR=Python/weppy"
-     - "TESTDIR=Python/wheezyweb"
-     - "TESTDIR=Python/wsgi"
-     - "TESTDIR=Ruby/grape"
-     - "TESTDIR=Ruby/h2o_mruby"
-     - "TESTDIR=Ruby/hanami"
-     - "TESTDIR=Ruby/padrino"
-     - "TESTDIR=Ruby/rack"
-     - "TESTDIR=Ruby/rack-sequel"
-     - "TESTDIR=Ruby/rails"
-     - "TESTDIR=Ruby/roda-sequel"
-     - "TESTDIR=Ruby/sinatra"
-     - "TESTDIR=Ruby/sinatra-sequel"
+     - 'TESTDIR="PHP/fuel "'
+     - 'TESTDIR="PHP/fat-free PHP/kohana PHP/kumbiaphp PHP/laravel PHP/limonade PHP/lumen PHP/silex PHP/symfony PHP/workerman PHP/zend PHP/zend1"'
+     - "TESTLANG=Python"
+     - "TESTLANG=Ruby"
      - "TESTLANG=Rust"
      - "TESTLANG=Scala"
      - "TESTLANG=Swift"

deployment/vagrant/bootstrap.sh

@@ -12,8 +12,8 @@ if [ ! -e "~/.firstboot" ]; then
   echo "Installing docker"
   curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
   sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  sudo apt-get update
-  sudo apt-get install -yqq docker-ce
+  sudo apt update
+  sudo apt install -yqq docker-ce
 
   # Setting up passwordless sudo
   echo "vagrant ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee -a /etc/sudoers

frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw-threadpool.dockerfile

@@ -1,30 +1,8 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt update -y
-RUN apt install -qqy g++-4.8
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip
+
+RUN apt install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 WORKDIR /installs

frameworks/C++/cpoll_cppsp/cpoll_cppsp-postgres-raw.dockerfile

@@ -1,30 +1,8 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt update -y
-RUN apt install -qqy g++-4.8
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip
+
+RUN apt install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 WORKDIR /installs

frameworks/C++/cpoll_cppsp/cpoll_cppsp-raw.dockerfile

@@ -1,30 +1,8 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt update -y
-RUN apt install -qqy g++-4.8
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip
+
+RUN apt install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 WORKDIR /installs

frameworks/C++/cpoll_cppsp/cpoll_cppsp.dockerfile

@@ -1,30 +1,8 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt update -y
-RUN apt install -qqy g++-4.8
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip
+
+RUN apt install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 WORKDIR /installs
@@ -40,7 +18,6 @@ RUN mv cppsp_rel$VERSION/ $CPPSP_HOME
 RUN sed -i 's|CXX := .*|CXX := g++-4.8|g' $CPPSP_HOME/makefile
 RUN sed -i 's|-Wall|-w|g' $CPPSP_HOME/makefile
 
-RUN apt install -yqq postgresql-server-dev-9.5
 ENV CPLUS_INCLUDE_PATH=/usr/include/postgresql:/usr/include/postgresql/9.5/server:${CPLUS_INCLUDE_PATH}
 
 ADD ./ /cpoll_cppsp

frameworks/C++/cpoll_cppsp/www/db_pg_threadpool

@@ -80,7 +80,7 @@ void doInit() override {
 	}
 	if(queries<1)queries=1;
 	if(queries>500)queries=500;
-	
+
 	items=(world*)sp->alloc(sizeof(world)*queries);
 	stmt=stmtPool.get();
 	poll->add(efd);

frameworks/C++/cppcms/cppcms-direct.dockerfile

@@ -1,28 +1,8 @@
-FROM ubuntu:16.04
+FROM buildpack-deps:xenial
 
-RUN apt-get update
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
-RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt install -yqq libgcrypt11-dev cmake python nginx
+RUN apt install -yqq libgcrypt11-dev python nginx
 
 WORKDIR /installs
 

frameworks/C++/cppcms/cppcms-postgres.dockerfile

@@ -1,28 +1,8 @@
-FROM ubuntu:16.04
+FROM buildpack-deps:xenial
 
-RUN apt-get update
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
-RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt install -yqq libgcrypt11-dev cmake python nginx
+RUN apt install -yqq libgcrypt11-dev python nginx
 
 WORKDIR /installs
 

frameworks/C++/cppcms/cppcms.dockerfile

@@ -1,33 +1,11 @@
-FROM ubuntu:16.04
+FROM buildpack-deps:xenial
 
-RUN apt-get update
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
-RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt install -yqq libgcrypt11-dev cmake python nginx
+RUN apt install -yqq libgcrypt11-dev python nginx
 
 WORKDIR /installs
 
-#http://cppcms.com/wikipp/en/page/cppcms_1x_build
-#note '-rc1' in the url
 ENV CPPCMS_VERSION=1.1.1
 ENV BACKNAME=cppcms
 ENV CPPCMS_HOME=/installs/$BACKNAME-$CPPCMS_VERSION

frameworks/C++/cutelyst/cutelyst-nginx-my.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \
@@ -77,7 +77,7 @@ RUN cd ${TROOT} && \
     -DCMAKE_BUILD_TYPE=Release && \
     make
 
-RUN apt-get install -yqq nginx
+RUN apt install -yqq nginx
 
 RUN sed -i "s|SendDate=.*|SendDate=false|g" /cutelyst_socket.ini
 

frameworks/C++/cutelyst/cutelyst-nginx-pg.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \
@@ -77,7 +77,7 @@ RUN cd ${TROOT} && \
     -DCMAKE_BUILD_TYPE=Release && \
     make
 
-RUN apt-get install -yqq nginx
+RUN apt install -yqq nginx
 
 RUN sed -i "s|SendDate=.*|SendDate=false|g" /cutelyst_socket.ini
 

frameworks/C++/cutelyst/cutelyst-nginx.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \
@@ -77,7 +77,7 @@ RUN cd ${TROOT} && \
     -DCMAKE_BUILD_TYPE=Release && \
     make
 
-RUN apt-get install -yqq nginx
+RUN apt install -yqq nginx
 
 RUN sed -i "s|SendDate=.*|SendDate=false|g" /cutelyst_socket.ini
 

frameworks/C++/cutelyst/cutelyst-pf-my-nodelay.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-pf-my.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-pf-nodelay.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-pf-pg-nodelay.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-pf-pg.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-thread-my-nodelay.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-thread-my.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-thread-nodelay.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-thread-pg-nodelay.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-thread-pg.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst-thread.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/cutelyst/cutelyst.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -33,8 +33,8 @@ ENV CMAKE_PREFIX_PATH /opt/qt${QT_VERSION_MM}
 ENV LD_LIBRARY_PATH ${CMAKE_PREFIX_PATH}/lib
 
 RUN apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt-get update -qq && \
-    apt-get install -qqy \
+    apt update -qq && \
+    apt install -yqq \
     cmake \
     clearsilver-dev \
     libgrantlee5-dev \

frameworks/C++/poco/poco.dockerfile

@@ -1,30 +1,8 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test
-RUN apt update -y
-RUN apt install -qqy g++-4.8
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
+
+RUN apt install -yqq g++-4.8 libjson0-dev
 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 50
 
 ENV POCO_VERSION 1.6.1

frameworks/C++/silicon/silicon.dockerfile

@@ -1,31 +1,11 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
 RUN add-apt-repository -s "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-3.9 main"
 RUN wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add -
 RUN apt -yq update
-RUN apt install -qqy clang-3.9 lldb-3.9
+RUN apt install -yqq clang-3.9 lldb-3.9
 
 ENV MICROHTTPD_VERSION=0.9.39
 ENV MICROHTTPD=/libmicrohttpd

frameworks/C++/treefrog/treefrog-hybrid.dockerfile

@@ -1,27 +1,6 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-# Install some common development tools
-RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
 ENV TFVER=1.19.0
 

frameworks/C++/treefrog/treefrog-mongodb.dockerfile

@@ -1,27 +1,6 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-# Install some common development tools
-RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
 ENV TFVER=1.19.0
 

frameworks/C++/treefrog/treefrog-postgres.dockerfile

@@ -1,27 +1,6 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-# Install some common development tools
-RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
 ENV TFVER=1.19.0
 

frameworks/C++/treefrog/treefrog.dockerfile

@@ -1,27 +1,6 @@
-FROM ubuntu:16.04
-
-RUN apt-get update
-
-# Install some common development tools
-RUN apt-get install -y software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+FROM buildpack-deps:xenial
+
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
 ENV TFVER=1.19.0
 

frameworks/C++/ulib/ulib-json.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib-json_fit.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib-mongodb.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib-mysql.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib-plaintext_fit.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib-postgres.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib-postgres_fit.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/ulib/ulib.dockerfile

@@ -1,8 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
+RUN apt update
 
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
+RUN apt install -yqq software-properties-common build-essential curl locales wget unzip git \
     libmysqlclient-dev libpq-dev \
     libpcre3 libpcre3-dev \
     libssl-dev libcurl4-openssl-dev \
@@ -24,7 +24,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
     apt-get -yq update && \
-    apt-get install -qqy gcc-6 g++-6
+    apt install -yqq gcc-6 g++-6
 
 ENV IROOT=/install
 ENV ULIB_VERSION=1.4.2

frameworks/C++/wt/wt-postgres.dockerfile

@@ -1,34 +1,10 @@
-FROM ubuntu:16.04
+FROM buildpack-deps:xenial
 
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
 RUN apt-get -yq update
-RUN apt-get install -qqy gcc-6 g++-6
-
-RUN apt-add-repository --yes ppa:george-edison55/cmake-3.x
-RUN apt-get update -qq
-RUN apt-get install -qqy cmake
+RUN apt install -yqq gcc-6 g++-6
 
 ENV WT_VERSION 4.0.2
 ENV BOOST_ROOT /boost

frameworks/C++/wt/wt.dockerfile

@@ -1,34 +1,10 @@
-FROM ubuntu:16.04
+FROM buildpack-deps:xenial
 
-RUN apt-get update
-
-RUN apt-get install -qqy software-properties-common build-essential curl locales wget unzip git \
-    libmysqlclient-dev libpq-dev \
-    libpcre3 libpcre3-dev \
-    libssl-dev libcurl4-openssl-dev \
-    zlib1g-dev \
-    libreadline6-dev \
-    libbz2-dev \
-    libxslt-dev libgdbm-dev ncurses-dev  \
-    libffi-dev libtool bison libevent-dev \
-    libgstreamer-plugins-base0.10-0 libgstreamer0.10-0 \
-    liborc-0.4-0 libgnutls-dev \
-    libjson0-dev libmcrypt-dev libicu-dev \
-    re2c libnuma-dev
-
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-ENV DEBIAN_FRONTEND noninteractive
+RUN apt update -yqq && apt install -yqq software-properties-common unzip cmake
 
 RUN add-apt-repository ppa:ubuntu-toolchain-r/test -y
 RUN apt-get -yq update
-RUN apt-get install -qqy gcc-6 g++-6
-
-RUN apt-add-repository --yes ppa:george-edison55/cmake-3.x
-RUN apt-get update -qq
-RUN apt-get install -qqy cmake
+RUN apt install -yqq gcc-6 g++-6
 
 ENV WT_VERSION 4.0.2
 ENV BOOST_ROOT /boost

frameworks/CSharp/nancy/README.md

@@ -50,7 +50,7 @@ comparing a variety of web platforms.
 
 ### Mono Installation
 
-    sudo apt-get install build-essential autoconf automake libtool zlib1g-dev git
+    sudo apt install build-essential autoconf automake libtool zlib1g-dev git
 
     git clone git://github.com/mono/mono
     cd mono

frameworks/CSharp/servicestack/README.md

@@ -44,7 +44,7 @@
 
 ## Mono Installation
 
-    sudo apt-get install build-essential autoconf automake libtool zlib1g-dev git
+    sudo apt install build-essential autoconf automake libtool zlib1g-dev git
 
     git clone git://github.com/mono/mono
     cd mono

frameworks/Crystal/amber/amber.dockerfile

@@ -11,7 +11,7 @@ ENV GC_MARKERS 1
 ENV AMBER_ENV production
 ENV DATABASE_URL postgres://benchmarkdbuser:benchmarkdbpass@tfb-database:5432/hello_world
 
-RUN apt-get install -y libyaml-dev
+RUN apt install -y libyaml-dev
 RUN shards build amber --release --no-debug
 
 CMD bash run.sh

frameworks/Haskell/servant/servant.dockerfile

@@ -1,6 +1,7 @@
 FROM haskell:8.2.1
 
-RUN apt update -yqq && apt install -yqq xz-utils make libpq-dev
+RUN apt update -yqq && apt install -yqq xz-utils make
+RUN apt install -yqq libpq-dev
 
 ADD ./ /servant
 WORKDIR /servant

frameworks/Haskell/snap/snap.dockerfile

@@ -1,6 +1,7 @@
 FROM haskell:8.2.1
 
-RUN apt update -yqq && apt install -yqq xz-utils make libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
+RUN apt update -yqq && apt install -yqq xz-utils make
+RUN apt install -yqq libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
 
 COPY ./bench /snap
 WORKDIR /snap

frameworks/Haskell/spock/spock.dockerfile

@@ -1,6 +1,7 @@
 FROM haskell:8.2.1
 
-RUN apt update -yqq && apt install -yqq xz-utils make libpq-dev
+RUN apt update -yqq && apt install -yqq xz-utils make
+RUN apt install -yqq libpq-dev
 
 ADD ./ /spock
 WORKDIR spock

frameworks/Haskell/yesod/yesod-mongodb-raw.dockerfile

@@ -1,6 +1,7 @@
 FROM haskell:7.10.3
 
-RUN apt update -yqq && apt install -yqq xz-utils make libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
+RUN apt update -yqq && apt install -yqq xz-utils make
+RUN apt install -yqq libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
 
 COPY ./yesod-mysql-mongo ./
 

frameworks/Haskell/yesod/yesod.dockerfile

@@ -1,6 +1,7 @@
 FROM haskell:7.10.3
 
-RUN apt update -yqq && apt install -yqq xz-utils make libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
+RUN apt update -yqq && apt install -yqq xz-utils make
+RUN apt install -yqq libpq-dev libmysqlclient-dev pkg-config libpcre3 libpcre3-dev
 
 COPY ./yesod-mysql-mongo ./
 

frameworks/Java/gemini/gemini-mysql.dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:9-jdk-slim as ant
-RUN apt update -qqy && apt install -qqy ant curl
+RUN apt update -qqy && apt install -yqq ant curl
 
 WORKDIR /gemini
 COPY Docroot Docroot

frameworks/Java/gemini/gemini-postgres.dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:9-jdk-slim as ant
-RUN apt update -qqy && apt install -qqy ant curl
+RUN apt update -qqy && apt install -yqq ant curl
 
 WORKDIR /gemini
 COPY Docroot Docroot

frameworks/Java/gemini/gemini.dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:9-jdk-slim as ant
-RUN apt update -qqy && apt install -qqy ant curl
+RUN apt update -qqy && apt install -yqq ant curl
 
 WORKDIR /gemini
 COPY Docroot Docroot

frameworks/Java/play1/play1.dockerfile

@@ -6,5 +6,5 @@ COPY public public
 COPY test test
 RUN wget -nv https://downloads.typesafe.com/play/1.5.0/play-1.5.0.zip
 RUN unzip -q play-1.5.0.zip
-RUN apt-get install -y python
+RUN apt install -y python
 CMD ["play-1.5.0/play", "run", "--%prod"]

frameworks/Java/revenj-jvm/revenj-jvm.dockerfile

@@ -6,8 +6,8 @@ COPY web.xml web.xml
 
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 RUN echo "deb http://download.mono-project.com/repo/debian wheezy main" | tee /etc/apt/sources.list.d/mono-xamarin.list
-RUN apt-get update
-RUN apt-get install -y mono-complete mono-fastcgi-server
+RUN apt update
+RUN apt install -y mono-complete mono-fastcgi-server
 
 RUN wget -q https://github.com/ngs-doo/revenj/releases/download/1.4.2/dsl-compiler.zip
 RUN unzip -o dsl-compiler.zip

frameworks/PHP/cakephp/cakephp.dockerfile

@@ -2,21 +2,21 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /cakephp
 WORKDIR /cakephp
@@ -26,7 +26,7 @@ RUN mkdir -p app/tmp/cache/persistent
 RUN mkdir -p app/tmp/logs
 RUN chmod -R 777 app/tmp
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php5.6-fpm start && \
     nginx -c /cakephp/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/clancats/clancats.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /clancats
 WORKDIR /clancats
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN git clone --branch v2.0.6 https://github.com/ClanCats/Framework.git clancatsapp
 RUN cp -r app/ clancatsapp/CCF/

frameworks/PHP/codeigniter/codeigniter-hhvm.dockerfile

@@ -4,23 +4,23 @@ RUN apt update -yqq && apt install -yqq software-properties-common apt-transport
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
 RUN add-apt-repository https://dl.hhvm.com/ubuntu
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq hhvm nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
-
 ADD ./ /codeigniter
 WORKDIR /codeigniter
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD hhvm -m daemon --config /codeigniter/deploy/config.hdf && \
     nginx -c /codeigniter/deploy/nginx-hhvm.conf -g "daemon off;"

frameworks/PHP/codeigniter/codeigniter.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /codeigniter
 WORKDIR /codeigniter
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php7.2-fpm start && \
     nginx -c /codeigniter/deploy/nginx-fpm.conf -g "daemon off;"

frameworks/PHP/cygnite/cygnite-raw.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /cygnite
 WORKDIR /cygnite
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php5.6-fpm start && \
     nginx -c /cygnite/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/cygnite/cygnite.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /cygnite
 WORKDIR /cygnite
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php5.6-fpm start && \
     nginx -c /cygnite/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/fat-free/fat-free-raw.dockerfile

@@ -2,20 +2,20 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /fat-free
 WORKDIR /fat-free

frameworks/PHP/fat-free/fat-free.dockerfile

@@ -2,20 +2,20 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /fat-free
 WORKDIR /fat-free

frameworks/PHP/fuel/fuel.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /fuel
 WORKDIR /fuel
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php5.6-fpm start && \
     nginx -c /fuel/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/hhvm/hhvm.dockerfile

@@ -4,19 +4,19 @@ RUN apt update -yqq && apt install -yqq software-properties-common apt-transport
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
 RUN add-apt-repository https://dl.hhvm.com/ubuntu
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq hhvm nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
-
 ADD ./ /hhvm_app
 WORKDIR /hhvm_app
 

frameworks/PHP/kohana/kohana.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /kohana
 WORKDIR /kohana
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /kohana
 

frameworks/PHP/kumbiaphp/kumbiaphp-raw.dockerfile

@@ -2,20 +2,20 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /kumbiaphp
 WORKDIR /kumbiaphp

frameworks/PHP/kumbiaphp/kumbiaphp.dockerfile

@@ -2,20 +2,20 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /kumbiaphp
 WORKDIR /kumbiaphp

frameworks/PHP/laravel/laravel.dockerfile

@@ -2,20 +2,21 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-mbstring php7.2-xml
-
-COPY deploy/conf/* /etc/php/7.2/fpm/
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
+RUN apt install -yqq php7.2-mbstring php7.2-xml
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /laravel
 WORKDIR /laravel
@@ -27,7 +28,7 @@ RUN mkdir -p /laravel/storage/framework/cache
 
 RUN chmod -R 777 /laravel
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN php artisan config:cache
 RUN php artisan route:cache

frameworks/PHP/limonade/limonade.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /limonade
 WORKDIR /limonade
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php7.2-fpm start && \
     nginx -c /limonade/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/lithium/lithium.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /lithium
 WORKDIR /lithium
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /lithium
 

frameworks/PHP/lumen/lumen.dockerfile

@@ -2,25 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring
-
-COPY deploy/conf/* /etc/php/7.2/fpm/
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
+RUN apt install -yqq php7.2-xml php7.2-mbstring
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /lumen
 WORKDIR /lumen
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN mkdir -p /lumen/storage
 RUN mkdir -p /lumen/storage/framework/sessions

frameworks/PHP/phalcon/phalcon-micro.dockerfile

@@ -2,20 +2,20 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /phalcon
 WORKDIR /phalcon

frameworks/PHP/phalcon/phalcon-mongodb.dockerfile

@@ -2,27 +2,27 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-mongodb
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /phalcon
 WORKDIR /phalcon
 
 RUN apt install -yqq php7.2-phalcon
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 app
 

frameworks/PHP/phalcon/phalcon.dockerfile

@@ -2,27 +2,27 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql  php7.2-mongodb
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /phalcon
 WORKDIR /phalcon
 
 RUN apt install -yqq php7.2-phalcon
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 app
 

frameworks/PHP/php/php-php5-raw.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /php
 WORKDIR /php
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /php
 

frameworks/PHP/php/php-php5.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql 
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /php
 WORKDIR /php
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /php
 

frameworks/PHP/php/php-raw7.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /php
 WORKDIR /php
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /php
 

frameworks/PHP/php/php.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /php
 WORKDIR /php
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /php
 

frameworks/PHP/phpixie/phpixie.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /phpixie
 WORKDIR /phpixie
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php7.2-fpm start && \
     nginx -c /phpixie/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/phreeze/phreeze.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /phreeze
 WORKDIR /phreeze
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php5.6-fpm start && \
     nginx -c /phreeze/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/silex/silex-raw.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /silex
 WORKDIR /silex
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN mv /silex/web/index_raw.php /silex/web/index.php
 

frameworks/PHP/silex/silex.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /silex
 WORKDIR /silex
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php7.2-fpm start && \
     nginx -c /silex/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/slim/slim-hhvm.dockerfile

@@ -4,23 +4,23 @@ RUN apt update -yqq && apt install -yqq software-properties-common apt-transport
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
 RUN add-apt-repository https://dl.hhvm.com/ubuntu
-RUN apt-get update -yqq
-RUN apt-get install -yqq hhvm nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
+RUN apt update -yqq
+RUN apt install -yqq hhvm nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
-
 ADD ./ /slim
 WORKDIR /slim
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /slim
 

frameworks/PHP/slim/slim-php5.dockerfile

@@ -2,26 +2,26 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt-get install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
-
-COPY deploy/conf/* /etc/php/5.6/fpm/
-RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php5.6 php5.6-common php5.6-cli php5.6-fpm php5.6-mysql php5.6-xml php5.6-mbstring php5.6-mcrypt
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/5.6/fpm/
+RUN sed -i "s|listen = /run/php/php7.2-fpm.sock|listen = /run/php/php5.6-fpm.sock|g" /etc/php/5.6/fpm/php-fpm.conf
 
 ADD ./ /slim
 WORKDIR /slim
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /slim
 

frameworks/PHP/slim/slim.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /slim
 WORKDIR /slim
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN chmod -R 777 /slim
 

frameworks/PHP/symfony/symfony-raw.dockerfile

@@ -2,27 +2,28 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml
-
-COPY deploy/conf/* /etc/php/7.2/fpm/
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
+RUN apt install php7.2-xml
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /symfony
 WORKDIR /symfony
 
 ENV APP_ENV=prod
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN php bin/console cache:clear --env=prod --no-debug --no-warmup
 RUN php bin/console cache:warmup --env=prod --no-debug

frameworks/PHP/symfony/symfony.dockerfile

@@ -2,27 +2,28 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml
-
-COPY deploy/conf/* /etc/php/7.2/fpm/
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
+RUN apt install php7.2-xml
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /symfony
 WORKDIR /symfony
 
 ENV APP_ENV=prod
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 RUN php bin/console cache:clear --env=prod --no-debug --no-warmup
 RUN php bin/console cache:warmup --env=prod --no-debug

frameworks/PHP/workerman/workerman.dockerfile

@@ -2,24 +2,24 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /workerman
 WORKDIR /workerman
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD php /workerman/server.php start

frameworks/PHP/yii2/yii2-hhvm.dockerfile

@@ -4,24 +4,23 @@ RUN apt update -yqq && apt install -yqq software-properties-common apt-transport
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
 RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xB4112585D386EB94
 RUN add-apt-repository https://dl.hhvm.com/ubuntu
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq hhvm nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring php7.2-mongodb
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
-
-
 ADD ./ /yii2
 WORKDIR /yii2
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD hhvm -m daemon --config /yii2/deploy/config.hdf && \
     nginx -c /yii2/deploy/nginx-hhvm.conf -g "daemon off;"

frameworks/PHP/yii2/yii2.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-mbstring
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /yii2
 WORKDIR /yii2
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php7.2-fpm start && \
     nginx -c /yii2/deploy/nginx-fpm.conf -g "daemon off;"

frameworks/PHP/zend/zend.dockerfile

@@ -2,20 +2,21 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
-RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql php7.2-xml php7.2-mbstring
-
-COPY deploy/conf/* /etc/php/7.2/fpm/
+RUN apt update -yqq
+RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
+RUN apt install -yqq php7.2-xml php7.2-mbstring
 
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /zend
 WORKDIR /zend
@@ -23,7 +24,7 @@ WORKDIR /zend
 RUN mkdir -p data/cache
 RUN chmod 777 data/cache
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php7.2-fpm start && \
     nginx -c /zend/deploy/nginx.conf -g "daemon off;"

frameworks/PHP/zend1/zend1.dockerfile

@@ -2,25 +2,25 @@ FROM ubuntu:16.04
 
 RUN apt update -yqq && apt install -yqq software-properties-common
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
-RUN apt-get update -yqq
+RUN apt update -yqq
 RUN apt install -yqq nginx git unzip php7.2 php7.2-common php7.2-cli php7.2-fpm php7.2-mysql
 
-COPY deploy/conf/* /etc/php/7.2/fpm/
-
 RUN mkdir /composer
 WORKDIR /composer
 
+ENV PATH /composer:${PATH}
+
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
 RUN php -r "if (hash_file('SHA384', 'composer-setup.php') === '544e09ee996cdf60ece3804abc52599c22b1f40f4323403c44d44fdfdd586475ca9813a858088ffbc1f233e9b180f061') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 
-ENV PATH /composer:${PATH}
+COPY deploy/conf/* /etc/php/7.2/fpm/
 
 ADD ./ /zend1
 WORKDIR /zend1
 
-RUN composer.phar install --no-progress
+RUN composer.phar install
 
 CMD service php7.2-fpm start && \
     nginx -c /zend1/deploy/nginx.conf -g "daemon off;"

toolset/databases/mysql/mysql.dockerfile

@@ -1,12 +1,12 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
-RUN apt-get install -qqy locales
+RUN apt update
+RUN apt install -yqq locales
 
 RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8  
-ENV LANGUAGE en_US:en  
-ENV LC_ALL en_US.UTF-8 
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 
 ADD create.sql create.sql
 ADD my.cnf my.cnf
@@ -14,7 +14,7 @@ ADD mysql.list mysql.list
 
 RUN cp mysql.list /etc/apt/sources.list.d/
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8C718D3B5072E1F5
-RUN apt-get update
+RUN apt update
 RUN ["/bin/bash", "-c", "debconf-set-selections <<< \"mysql-community-server mysql-community-server/data-dir select 'Y'\""]
 RUN ["/bin/bash", "-c", "debconf-set-selections <<< \"mysql-community-server mysql-community-server/root-pass password secret\""]
 RUN ["/bin/bash", "-c", "debconf-set-selections <<< \"mysql-community-server mysql-community-server/re-root-pass password secret\""]
@@ -39,4 +39,4 @@ RUN chown -R mysql:mysql /var/lib/mysql /var/log/mysql /var/run/mysqld /ssd && \
     mysqladmin -uroot -psecret flush-hosts && \
     mysql -uroot -psecret < create.sql
 
-CMD chown -R mysql:mysql /var/lib/mysql /var/log/mysql /var/run/mysqld /ssd && mysqld
+CMD chown -R mysql:mysql /var/lib/mysql /var/log/mysql /var/run/mysqld /ssd && mysqld

toolset/databases/postgres/postgres.dockerfile

@@ -1,12 +1,12 @@
 FROM ubuntu:16.04
 
-RUN apt-get update
-RUN apt-get install -qqy locales
+RUN apt update
+RUN apt install -yqq locales
 
 RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8  
-ENV LANGUAGE en_US:en  
-ENV LC_ALL en_US.UTF-8 
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
 
 ADD postgresql.conf postgresql.conf
 ADD pg_hba.conf pg_hba.conf
@@ -50,4 +50,4 @@ RUN service postgresql start && \
 
 ENV PATH $PATH:/usr/lib/postgresql/$PG_VERSION/bin
 
-CMD ["postgres"]
+CMD ["postgres"]