Merge branch 'mi_support_ubuntu20' into 'develop'

Mi support ubuntu20

See merge request !5

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
 variables:
   GIT_DEPTH: 1
   GIT_SUBMODULE_STRATEGY: recursive
-  BUILDER_IMAGE_TAG: "@sha256:490fc2d6ebab2ae3717a46e8ef3d65aed44af8855918cbcbe741a2965d7d70d5"
+  BUILDER_IMAGE_TAG: "@sha256:370887eb9d2b95162513987060bec7dd10f4d2fb80adbec70fb83bd601786fa5"
 
 hive_fork_manager:
   stage: build_and_test

CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED( VERSION 3.14 )
 
 PROJECT( haf )
+SET( Boost_NO_BOOST_CMAKE ON CACHE STRING "ON or OFF" FORCE )
 SET( HAF_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
 
 ADD_SUBDIRECTORY( hive EXCLUDE_FROM_ALL )

Dockerfile

-# docker build -f Dockerfile.postgres13  -t psql-tools13 .
-FROM phusion/baseimage:0.11
+# docker build -f Dockerfile -t haf .
+FROM phusion/baseimage:focal-1.0.0
 
 ENV LANG=en_US.UTF-8
 
-RUN \
-    apt-get update \
-    && apt-get install -y wget \
-    && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/postgresql-pgdg.list > /dev/null \
-    && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null \
-    && apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main"
-
 RUN \
     apt-get update \
     && apt-get install -y \
             systemd \
             autoconf \
-            postgresql-12 \
-            postgresql-contrib-12 \
+            postgresql \
+            postgresql-contrib \
             build-essential \
             cmake \
             libboost-all-dev \
@@ -27,6 +19,7 @@ RUN \
             libssl-dev \
             libreadline-dev \
             libsnappy-dev \
+            libpqxx-dev \
     && \
         apt-get clean
 

Dockerfile.ubuntu18.04

+# docker build -f Dockerfile.postgres13  -t psql-tools13 .
+FROM phusion/baseimage:0.11
+
+ENV LANG=en_US.UTF-8
+
+RUN \
+    apt-get update \
+    && apt-get install -y wget \
+    && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+    && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/postgresql-pgdg.list > /dev/null \
+    && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null \
+    && apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main"
+
+RUN \
+    apt-get update \
+    && apt-get install -y \
+            systemd \
+            autoconf \
+            postgresql-12 \
+            postgresql-contrib-12 \
+            build-essential \
+            cmake \
+            libboost-all-dev \
+            postgresql-server-dev-12 \
+            git \
+            python3-pip \
+            libssl-dev \
+            libreadline-dev \
+            libsnappy-dev \
+    && \
+        apt-get clean
+
+RUN \
+    python3 -mpip install \
+        pexpect \
+        psycopg2 \
+        sqlalchemy \
+        jinja2
+
+
+
+ADD . /usr/local/src
+WORKDIR /usr/local/src
+
+USER postgres
+RUN  /etc/init.d/postgresql start \
+     && psql --command "CREATE USER root WITH SUPERUSER CREATEDB;"
+
+USER root
\ No newline at end of file

hive @ cbe4c91b

-Subproject commit 3bbafe211202aba20e7753a1b914c286f82012b1
+Subproject commit cbe4c91b817296c014ddd5fe28d1ae3cdd385873