Jenkins: Add new dockerfile for PG11
JIRA: MADLIB-1469
This commit also updates the jenkins tests to use this new docker
image. Update pipeline links in README.
Co-authored-by: Nikhil Kak <nkak@vmware.com>
diff --git a/tool/docker/base/Dockerfile_postgres_11_Jenkins b/tool/docker/base/Dockerfile_postgres_11_Jenkins
new file mode 100644
index 0000000..101ed5b
--- /dev/null
+++ b/tool/docker/base/Dockerfile_postgres_11_Jenkins
@@ -0,0 +1,40 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+FROM postgres:11
+
+### Get postgres specific add-ons
+RUN apt-get update && apt-get install -y wget \
+ build-essential \
+ postgresql-server-dev-11 \
+ postgresql-plpython-11 \
+ openssl \
+ libssl-dev \
+ libboost-all-dev \
+ m4 \
+ rpm \
+ python-pip \
+ python-dev \
+ build-essential \
+ cmake \
+ libspatialindex-dev
+
+RUN pip install tensorflow==1.14 dill "rtree>=0.8,<0.9"
+
+## To build an image from this docker file, from madlib folder, run:
+# docker build -t madlib/postgres_11:jenkins -f tool/docker/base/Dockerfile_postgres_11_Jenkins .
diff --git a/tool/docker/base/README.md b/tool/docker/base/README.md
index 486cdb7..66a34f4 100644
--- a/tool/docker/base/README.md
+++ b/tool/docker/base/README.md
@@ -5,7 +5,7 @@
1) Dockerfile_postgres_9_6: Plese use this configuration for development purposes. Please refer to the [top level README](https://github.com/apache/madlib/blob/master/README.md) for setup instructions.
-2) Dockerfile_postgres_9_6_Jenkins: This configuration is used by the Jenkins builds (https://builds.apache.org/job/madlib-master-build and https://builds.apache.org/job/madlib-pr-build).
+2) Dockerfile_postgres_11_Jenkins: This configuration is used by the Jenkins builds (https://ci-builds.apache.org/job/Madlib/job/madlib-build/job/master and https://ci-builds.apache.org/job/Madlib/job/madlib-build/view/change-requests/).
## The rest of the configs are based on CentOS images:
diff --git a/tool/jenkins/jenkins_build.sh b/tool/jenkins/jenkins_build.sh
index a904be4..560bcd6 100755
--- a/tool/jenkins/jenkins_build.sh
+++ b/tool/jenkins/jenkins_build.sh
@@ -43,14 +43,14 @@
echo "Creating docker container"
# Pull down the base docker images
-echo "docker pull madlib/postgres_10:jenkins"
-docker pull madlib/postgres_10:jenkins
+echo "docker pull madlib/postgres_11:jenkins"
+docker pull madlib/postgres_11:jenkins
# Launch docker container with volume mounted from workdir
echo "-------------------------------"
cat <<EOF
-docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}":/madlib madlib/postgres_10:jenkins | tee logs/docker_setup.log
+docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}":/madlib madlib/postgres_11:jenkins | tee logs/docker_setup.log
EOF
-docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}":/madlib madlib/postgres_10:jenkins | tee logs/docker_setup.log
+docker run -d -e POSTGRES_PASSWORD=postgres --name madlib -v "${workdir}":/madlib madlib/postgres_11:jenkins | tee logs/docker_setup.log
echo "-------------------------------"
## This sleep is required since it takes a couple of seconds for the docker
