Add docker files

Author: ildus

.travis.yml

@@ -6,28 +6,29 @@ dist: trusty
 
 language: c
 
-compiler:
-  - clang
-  - gcc
+services:
+    - docker
 
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y install -qq wget ca-certificates; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source ./travis/dep-ubuntu-postgres.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source ./travis/dep-ubuntu-llvm.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+install:
+    - sed -e 's/${CC}/'${CC}/g -e 's/${PG_VERSION}/'${PG_VERSION}/g Dockerfile.tmpl  > Dockerfile
+    - docker-compose build
 
-env:
-  global:
-    - LLVM_VER=4.0
-  matrix:
-    - PG_VER=10  CHECK_CODE=true
-    - PG_VER=10  CHECK_CODE=false
-    - PG_VER=9.6 CHECK_CODE=true
-    - PG_VER=9.6 CHECK_CODE=false
-    - PG_VER=9.5 CHECK_CODE=true
-    - PG_VER=9.5 CHECK_CODE=false
+script:
+    - docker-compose run tests
 
-script: bash ./travis/pg-travis-test.sh
+env:
+    - PG_VERSION=10  CHECK_CODE=true CC=clang
+    - PG_VERSION=10  CHECK_CODE=false CC=clang
+    - PG_VERSION=9.6 CHECK_CODE=true CC=clang
+    - PG_VERSION=9.6 CHECK_CODE=false CC=clang
+    - PG_VERSION=9.5 CHECK_CODE=true CC=clang
+    - PG_VERSION=9.5 CHECK_CODE=false CC=clang
+    - PG_VERSION=10  CHECK_CODE=true CC=gcc
+    - PG_VERSION=10  CHECK_CODE=false CC=gcc
+    - PG_VERSION=9.6 CHECK_CODE=true CC=gcc
+    - PG_VERSION=9.6 CHECK_CODE=false CC=gcc
+    - PG_VERSION=9.5 CHECK_CODE=true CC=gcc
+    - PG_VERSION=9.5 CHECK_CODE=false CC=gcc
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

Dockerfile.tmpl

@@ -0,0 +1,21 @@
+FROM postgres:${PG_VERSION}-alpine
+
+ENV LANG=C.UTF-8
+RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/main' > /etc/apk/repositories && \
+	echo 'http://dl-cdn.alpinelinux.org/alpine/v3.6/community' >> /etc/apk/repositories && \
+		apk --no-cache add cmocka cppcheck cmake python3 gcc make ${CC}
+RUN apk add --no-cache musl-dev cmocka-dev
+RUN pip3 install testgres
+
+ENV PGDATA=/pg/data
+RUN mkdir -p /pg/data && \
+	mkdir /pg/pg_pathman && \
+	chown postgres:postgres ${PGDATA} && \
+	chmod a+rwx /usr/local/lib/postgresql && \
+	chmod a+rwx /usr/local/share/postgresql/extension
+
+ADD . /pg/pg_pathman
+WORKDIR /pg/pg_pathman
+RUN chmod -R go+rwX /pg/pg_pathman
+USER postgres
+RUN PGDATA=${PGDATA} CC=${CC} CHECK_CODE=${CHECK_CODE} bash run_tests.sh

src/utility_stmt_hooking.c

@@ -31,8 +31,10 @@
 #include "utils/memutils.h"
 #include "utils/rls.h"
 
-#include "libpq/libpq.h"
-
+/* we avoid includig libpq.h because it requires openssl.h */
+#include "libpq/pqcomm.h"
+extern ProtocolVersion FrontendProtocol;
+extern void pq_endmsgread(void);
 
 /* Determine whether we should enable COPY or not (PostgresPro has a fix) */
 #if defined(WIN32) && \

travis/pg-travis-test.sh

@@ -68,7 +68,7 @@ CLUSTER_PATH=$(pwd)/test_cluster
 $initdb_path -D $CLUSTER_PATH -U $USER -A trust
 
 # build pg_pathman (using CFLAGS_SL for gcov)
-make USE_PGXS=1 PG_CONFIG=$config_path CFLAGS_SL="$($config_path --cflags_sl) -coverage"
+make USE_PGXS=1 CC=${CC} PG_CONFIG=$config_path CFLAGS_SL="$($config_path --cflags_sl) -coverage"
 sudo make install USE_PGXS=1 PG_CONFIG=$config_path
 
 # check build