From 96f63acdc290b135f8fee3b79bcd71cfcd94aca8 Mon Sep 17 00:00:00 2001 From: Patrick Molgaard Date: Tue, 17 Jan 2017 10:24:57 +0000 Subject: [PATCH 1/2] add temporal tables, json_enhancements and pg_amqp --- 9.2/Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/9.2/Dockerfile b/9.2/Dockerfile index b5b1c93a0a..357fdd6585 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -36,9 +36,14 @@ RUN apt-get update \ && apt-get install -y postgresql-common \ && sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf \ && apt-get install -y \ + make gcc python-pip git \ postgresql-$PG_MAJOR=$PG_VERSION \ postgresql-contrib-$PG_MAJOR=$PG_VERSION \ - && rm -rf /var/lib/apt/lists/* + postgresql-server-dev-$PG_MAJOR \ + && rm -rf /var/lib/apt/lists/* \ + && pip install pgxnclient && pgxn install temporal_tables \ + && git clone https://bitbucket.org/IVC-Inc/json_enhancements && cd json_enhancements && NOHSTORE=1 make && make install \ + && cd ~ && git clone https://github.com/omniti-labs/pg_amqp && cd pg_amqp && make && make install # make the sample config easier to munge (and "correct by default") RUN mv -v /usr/share/postgresql/$PG_MAJOR/postgresql.conf.sample /usr/share/postgresql/ \ From 80677e99cc79ab1169280ebe989962cb15f0c14a Mon Sep 17 00:00:00 2001 From: Patrick Molgaard Date: Wed, 18 Jan 2017 01:27:05 +0000 Subject: [PATCH 2/2] enable extensions in entrypoint --- 9.2/Dockerfile | 2 ++ 9.2/enable-extensions.sh | 8 ++++++++ 2 files changed, 10 insertions(+) create mode 100644 9.2/enable-extensions.sh diff --git a/9.2/Dockerfile b/9.2/Dockerfile index 357fdd6585..73d36efd53 100644 --- a/9.2/Dockerfile +++ b/9.2/Dockerfile @@ -58,6 +58,8 @@ VOLUME /var/lib/postgresql/data COPY docker-entrypoint.sh / +COPY enable-extensions.sh docker-entrypoint-initdb.d/ + ENTRYPOINT ["/docker-entrypoint.sh"] EXPOSE 5432 diff --git a/9.2/enable-extensions.sh b/9.2/enable-extensions.sh new file mode 100644 index 0000000000..3a0c21c985 --- /dev/null +++ b/9.2/enable-extensions.sh @@ -0,0 +1,8 @@ +#!/bin/bash +psql template1 -U $POSTGRES_USER --dbname $POSTGRES_DB -c 'create extension json_enhancements;' && \ +psql template1 -U $POSTGRES_USER --dbname $POSTGRES_DB -c "CREATE EXTENSION temporal_tables" && \ +psql template1 -U $POSTGRES_USER --dbname $POSTGRES_DB -c "GRANT ALL ON FUNCTION versioning() TO $POSTGRES_USER" && \ +psql template1 -U $POSTGRES_USER --dbname $POSTGRES_DB -c 'CREATE EXTENSION "uuid-ossp" schema pg_catalog;' && \ +psql template1 -U $POSTGRES_USER --dbname $POSTGRES_DB -c 'CREATE EXTENSION IF NOT EXISTS "pg_trgm"' && \ +psql template1 -U $POSTGRES_USER --dbname $POSTGRES_DB -c 'CREATE EXTENSION IF NOT EXISTS amqp' +