From 6ce13a08ef86f3b3e49e4884789ff5e68e3bf2d0 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Wed, 21 Nov 2018 13:09:16 +0300
Subject: [PATCH] Move build and test images to 18.10, add libraries for
 unbundled build in debian image

---
 docker/packager/binary/Dockerfile  |  2 +-
 docker/packager/deb/Dockerfile     | 37 ++++++++++++++++++++++++++----
 docker/test/integration/Dockerfile |  6 +++++
 docker/test/stateless/Dockerfile   |  2 +-
 docker/test/stress/Dockerfile      |  2 +-
 5 files changed, 42 insertions(+), 7 deletions(-)
 create mode 100644 docker/test/integration/Dockerfile

diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary/Dockerfile
index 49b757e1b00..9ba86d64272 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:18.10
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/packager/deb/Dockerfile b/docker/packager/deb/Dockerfile
index 9e0abd3afd4..f1cd86fa85a 100644
--- a/docker/packager/deb/Dockerfile
+++ b/docker/packager/deb/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:18.10
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
@@ -12,17 +12,46 @@ RUN apt-get update -y \
             gcc-8 \
             g++-8 \
             clang-6.0 \
-            clang++-6.0 \
+            clang-7 \
             lld-6.0 \
             libclang-6.0-dev \
-            libicu-dev \
             liblld-6.0-dev \
+            llvm-6.0 \
+            libllvm6.0 \
+            llvm-6.0-dev \
+            lld-7 \
+            libclang-7-dev \
+            liblld-7-dev \
+            libllvm7 \
+            llvm-7-dev \
+            libicu-dev \
             libreadline-dev \
             ninja-build \
             perl \
             pkg-config \
             devscripts \
             debhelper \
-            git
+            git \
+            libc++abi-dev \
+            libc++-dev \
+            libboost-program-options-dev \
+            libboost-system-dev \
+            libboost-filesystem-dev \
+            libboost-thread-dev \
+            zlib1g-dev \
+            liblz4-dev \
+            libdouble-conversion-dev \
+            libsparsehash-dev \
+            librdkafka-dev \
+            libpoconetssl60 \
+            libpoco-dev \
+            libsparsehash-dev \
+            libgoogle-perftools-dev \
+            libzstd-dev \
+            libre2-dev \
+            libjemalloc-dev \
+            unixodbc-dev \
+            odbcinst
+
 
 CMD /bin/bash build/release --no-pbuilder && mv /*.deb /output
diff --git a/docker/test/integration/Dockerfile b/docker/test/integration/Dockerfile
new file mode 100644
index 00000000000..3188bc083d3
--- /dev/null
+++ b/docker/test/integration/Dockerfile
@@ -0,0 +1,6 @@
+FROM ubuntu:18.10
+
+RUN apt-get update && apt-get -y install tzdata
+
+ENV TZ=Europe/Moscow
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 5664a16078e..fde139b1ec9 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:18.10
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile
index 8954c41efae..c75f78965c5 100644
--- a/docker/test/stress/Dockerfile
+++ b/docker/test/stress/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:18.10
 
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \