8000 Merge branch 'updates-and-fixes' of https://github.com/supabase/postg… · octavetn/postgres@3d0f98c · GitHub
[go: up one dir, main page]

Skip to content

Commit 3d0f98c

Browse files
committed
Merge branch 'updates-and-fixes' of https://github.com/supabase/postgres into updates-and-fixes
2 parents 32cd90d + cdb20f3 commit 3d0f98c

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

ansible/vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ postgresql_ext_install_dev_headers: yes
1313
postgresql_ext_postgis_version: 3
1414

1515
postgresql_shared_preload_libraries:
16-
[pg_stat_statements, pgaudit, plpgsql, plpgsql_check]
16+
[pg_stat_statements, pgaudit, plpgsql, plpgsql_check, pg_cron]
1717

1818
postgresql_pg_hba_custom:
1919
- {

docker/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
FROM postgres:12
22

3+
# install pgcron
4+
RUN apt-get update \
5+
&& apt-get install postgresql-12-cron -y
6+
37
# install postgis
48
ENV POSTGIS_MAJOR 3
59
ENV POSTGIS_VERSION 3.0.0+dfsg-2~exp1.pgdg100+1
@@ -147,7 +151,7 @@ RUN plv8Dependencies="build-essential \
147151
&& rm -rf /tmp/build /var/lib/apt/lists/* /var/tmp/*
148152

149153
# install pljava
150-
ENV PLJAVA_VERSION=V1_5_5
154+
ENV PLJAVA_VERSION=V1_6_0
151155

152156
RUN pljavaDependencies="git \
153157
ca-certificates \
@@ -166,7 +170,7 @@ RUN pljavaDependencies="git \
166170
&& cd pljava \
167171
&& git checkout ${PLJAVA_VERSION} \
168172
&& mvn clean install \
169-
&& java -jar pljava-packaging/target/pljava-pg12.3-amd64-Linux-gpp.jar \
173+
&& java -jar pljava-packaging/target/pljava-pg12.jar \
170174
&& apt-get clean \
171175
&& apt-get remove -y ${pljavaDependencies} \
172176
&& apt-get autoremove -y \

docker/mnt/init-permissions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
echo "host replication $POSTGRES_USER 0.0.0.0/0 trust" >> $PGDATA/pg_hba.conf
5-
echo "shared_preload_libraries = 'pg_stat_statements, pgaudit'" >> $PGDATA/postgresql.conf
5+
echo "shared_preload_libraries = 'pg_stat_statements, plpgsql, plpgsql_check, pg_cron'" >> $PGDATA/postgresql.conf
66
echo "pg_stat_statements.max = 10000" >> $PGDATA/postgresql.conf
77
echo "pg_stat_statements.track = all" >> $PGDATA/postgresql.conf
88
echo "wal_level=logical" >> $PGDATA/postgresql.conf

0 commit comments

Comments
 (0)
0