From a6244c31907dcaab9fab9bb24cd912bb71f3fa47 Mon Sep 17 00:00:00 2001 From: Martin Bednar Date: Wed, 23 Mar 2016 15:48:18 +0100 Subject: [PATCH 1/2] Support for PostgreSQL 9.5 --- Dockerfile | 9 +++++---- docker-entrypoint-initdb.d/01_init_pljava.sql | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4a1d5f..0f33616 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # vim:set ft=dockerfile: -FROM postgres:9.4 +FROM postgres:9.5 RUN apt-get update RUN apt-get -y upgrade @@ -16,18 +16,19 @@ RUN apt-get update ENV TERM xterm-256color RUN apt-get -y install git maven -RUN apt-get -y install postgresql-server-dev-9.4 libpq-dev libecpg-dev +RUN apt-get -y install postgresql-server-dev-9.5 libpq-dev libecpg-dev RUN apt-get -y install g++ libkrb5-dev RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections RUN apt-get -y install oracle-java8-installer RUN git clone https://github.com/tada/pljava.git -RUN export PGXS=/usr/lib/postgresql/9.4/lib/pgxs/src/makefiles/pgxs.mk +RUN export PGXS=/usr/lib/postgresql/9.5/lib/pgxs/src/makefiles/pgxs.mk WORKDIR pljava +RUN git checkout V1_5_0b3 RUN mvn clean RUN mvn install -RUN java -jar /pljava/pljava-packaging/target/pljava-pg9.4-amd64-Linux-gpp.jar +RUN java -jar /pljava/pljava-packaging/target/pljava-pg9.5-amd64-Linux-gpp.jar ADD /docker-entrypoint-initdb.d /docker-entrypoint-initdb.d diff --git a/docker-entrypoint-initdb.d/01_init_pljava.sql b/docker-entrypoint-initdb.d/01_init_pljava.sql index abed391..91a4b29 100644 --- a/docker-entrypoint-initdb.d/01_init_pljava.sql +++ b/docker-entrypoint-initdb.d/01_init_pljava.sql @@ -1,7 +1,8 @@ +SELECT version(); SET pljava.libjvm_location TO '/usr/lib/jvm/java-8-oracle/jre/lib/amd64/server/libjvm.so'; ALTER DATABASE postgres SET pljava.libjvm_location FROM CURRENT; CREATE EXTENSION pljava; -SELECT sqlj.install_jar('file:///pljava/pljava-examples/target/pljava-examples-1.6.0-SNAPSHOT.jar', 'examples', true); +SELECT sqlj.install_jar('file:///pljava/pljava-examples/target/pljava-examples-1.5.0-BETA3.jar', 'examples', true); SHOW search_path; SELECT sqlj.get_classpath('javatest'); SELECT sqlj.set_classpath('javatest', 'examples'); From 2d74f08b9c08d3043eb63785f339fc5b15b737ae Mon Sep 17 00:00:00 2001 From: Martin Bednar Date: Wed, 23 Mar 2016 18:02:17 +0100 Subject: [PATCH 2/2] Version information printed during startup --- docker-entrypoint-initdb.d/01_init_pljava.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-entrypoint-initdb.d/01_init_pljava.sql b/docker-entrypoint-initdb.d/01_init_pljava.sql index 91a4b29..2bc5032 100644 --- a/docker-entrypoint-initdb.d/01_init_pljava.sql +++ b/docker-entrypoint-initdb.d/01_init_pljava.sql @@ -8,3 +8,4 @@ SELECT sqlj.get_classpath('javatest'); SELECT sqlj.set_classpath('javatest', 'examples'); SELECT sqlj.get_classpath('javatest'); SELECT javatest.java_addone(3); +SELECT array_agg(java_getsystemproperty(p)) FROM (values ('org.postgresql.pljava.version'), ('org.postgresql.version'), ('java.version'), ('os.name'), ('os.arch') ) AS props(p);