cutelyst: Update to 2.3.0 and use ubuntu 18.04 as base (#3720)

* cutelyst: Update to 2.3.0 and use ubuntu 18.04 as base

* cutelyst: Add MySql and Postgres drivers

frameworks/C++/cutelyst/build.sh

@@ -1,27 +1,24 @@
 #!/bin/bash
 
-export CUTELYST_VER=2.2.2
+export CUTELYST_VER=2.3.0
 
-export QT_VERSION_MM=59
-export QT_VERSION_FULL=594-xenial
-
-export CMAKE_PREFIX_PATH=/opt/qt${QT_VERSION_MM}
-
-echo ${CMAKE_PREFIX_PATH}/lib > /etc/ld.so.conf.d/qt${QT_VERSION_MM}.conf
-ldconfig
-
-apt-add-repository --yes ppa:beineri/opt-qt$QT_VERSION_FULL && \
-    apt update -qq && \
-    apt install -yqq \
+apt update -qq && \
+    apt install -yqq --no-install-recommends \
     cmake \
+    pkg-config \
     clearsilver-dev \
     libgrantlee5-dev \
     libjemalloc-dev \
-    qt${QT_VERSION_MM}base \
-    qt${QT_VERSION_MM}script \
-    qt${QT_VERSION_MM}tools
-
-apt install -yqq uwsgi uwsgi uuid-dev libcap-dev libzmq3-dev nginx
+    libqt5sql5-mysql \
+    libqt5sql5-psql \
+    uwsgi \
+    uuid-dev \
+    libcap-dev \
+    libssl-dev \
+    libzmq3-dev \
+    libpcre3-dev \
+    zlib1g-dev \
+    nginx 
 
 wget -q https://github.com/cutelyst/cutelyst/archive/v$CUTELYST_VER.tar.gz -O cutelyst-$CUTELYST_VER.tar.gz && \
     tar zxf cutelyst-$CUTELYST_VER.tar.gz && \

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

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

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8

frameworks/C++/cutelyst/cutelyst.dockerfile

@@ -1,20 +1,7 @@
-FROM ubuntu:16.04
-
-RUN apt update
-
-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 \
-    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
+FROM ubuntu:18.04
+
+RUN apt update -qq && \
+    apt install -yqq locales wget build-essential
 
 RUN locale-gen en_US.UTF-8
 ENV LANG en_US.UTF-8