Skip to content

Commit f7f2115

Browse files
authored
add pg_jobmon and pg_partman extensions (#131)
Signed-off-by: Piyush Raj <[email protected]>
1 parent 66be9e0 commit f7f2115

File tree

6 files changed

+189
-6
lines changed

6 files changed

+189
-6
lines changed

.github/workflows/smoke-test.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,15 @@ jobs:
8686
echo "Test pgautofailover Extension"
8787
psql -c "CREATE EXTENSION pgautofailover CASCADE;"
8888
psql -c "SELECT pgautofailover.formation_settings();"
89+
90+
echo "Test pg_jobmon Extension"
91+
psql -c " CREATE SCHEMA jobmon;"
92+
psql -c "CREATE EXTENSION pg_jobmon SCHEMA jobmon cascade;"
93+
94+
echo "Test pg_partman Extension"
95+
psql -c "CREATE SCHEMA partman;"
96+
psql -c "CREATE EXTENSION pg_partman SCHEMA partman;"
97+
8998
break
9099
fi
91100
sleep 1

Dockerfile

Lines changed: 73 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,4 +318,76 @@ RUN set -eux \
318318
# clean
319319
&& cd / \
320320
&& rm -rf /tmp/postgresql-hll-${POSTGRES_HLL_VERSION} /tmp/postgresql-hll-${POSTGRES_HLL_VERSION}.zip \
321-
&& apk del .postgresql-hll-build-deps
321+
&& apk del .postgresql-hll-build-deps
322+
323+
# Install pg_jobmon
324+
ARG PG_JOBMON_VERSION
325+
RUN set -e \
326+
\
327+
&& apk add --no-cache --virtual .pg_jobmon-deps \
328+
ca-certificates \
329+
openssl \
330+
tar \
331+
\
332+
&& cd /tmp\
333+
&& wget -O pg_jobmon.tar.gz "https://github.com/omniti-labs/pg_jobmon/archive/v$PG_JOBMON_VERSION.tar.gz" \
334+
&& mkdir -p /tmp/pg_jobmon \
335+
&& tar \
336+
--extract \
337+
--file pg_jobmon.tar.gz \
338+
--directory /tmp/pg_jobmon \
339+
--strip-components 1 \
340+
\
341+
&& apk add --no-cache --virtual .pg_jobmon-build-deps \
342+
autoconf \
343+
automake \
344+
g++ \
345+
clang15 \
346+
llvm15 \
347+
libtool \
348+
libxml2-dev \
349+
make \
350+
perl \
351+
&& cd /tmp/pg_jobmon \
352+
&& ls -alh . \
353+
&& make \
354+
&& make install \
355+
&& cd / \
356+
&& apk del .pg_jobmon-deps .pg_jobmon-build-deps \
357+
&& rm -rf /tmp/pg_jobmon \
358+
&& rm /tmp/pg_jobmon.tar.gz
359+
360+
# Adding pg_partman
361+
ARG PG_PARTMAN_VERSION
362+
363+
RUN set -e \
364+
&& cd /tmp\
365+
&& apk add --no-cache --virtual .pg_partman-deps \
366+
ca-certificates \
367+
openssl \
368+
tar \
369+
&& apk add --no-cache --virtual .pg_partman-build-deps \
370+
autoconf \
371+
automake \
372+
g++ \
373+
clang15 \
374+
llvm15 \
375+
libtool \
376+
libxml2-dev \
377+
make \
378+
perl \
379+
&& wget -O pg_partman.tar.gz "https://github.com/pgpartman/pg_partman/archive/v$PG_PARTMAN_VERSION.tar.gz" \
380+
&& mkdir -p /tmp/pg_partman \
381+
&& tar \
382+
--extract \
383+
--file pg_partman.tar.gz \
384+
--directory /tmp/pg_partman \
385+
--strip-components 1 \
386+
&& cd /tmp/pg_partman \
387+
&& make \
388+
&& make install \
389+
# clean
390+
&& cd / \
391+
&& rm /tmp/pg_partman.tar.gz \
392+
&& rm -rf /tmp/pg_partman \
393+
&& apk del .pg_partman-deps .pg_partman-build-deps

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ CITUS_VERSION=12.1.0
1111
PG_REPACK_VERSION=1.5.0
1212
PG_AUTO_FAILOVER_VERSION=2.1
1313
POSTGRES_HLL_VERSION=2.18
14+
PG_JOBMON_VERSION=1.4.1
15+
PG_PARTMAN_VERSION=5.0.1
1416
PREV_TS_VERSION=$(shell wget --quiet -O - https://raw.githubusercontent.com/timescale/timescaledb/${TS_VERSION}/version.config | grep update_from_version | sed -e 's!update_from_version = !!')
1517
PREV_TS_IMAGE="timescale/timescaledb:$(PREV_TS_VERSION)-pg$(PG_VER_NUMBER)$(PREV_EXTRA)"
1618
PREV_IMAGE=$(shell if docker pull $(PREV_TS_IMAGE) >/dev/null; then echo "$(PREV_TS_IMAGE)"; else echo "postgres:$(PG_VER_NUMBER)-alpine"; fi )
@@ -36,9 +38,12 @@ DOCKER_BUILD_ARGS = --build-arg TS_VERSION=$(TS_VERSION) \
3638
--build-arg PG_CRON_VERSION=$(PG_CRON_VERSION) \
3739
--build-arg PG_REPACK_VERSION=$(PG_REPACK_VERSION)\
3840
--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) \
39-
--build-arg POSTGRES_HLL_VERSION=$(POSTGRES_HLL_VERSION)\
4041
--build-arg CITUS_VERSION=$(CITUS_VERSION) \
41-
--build-arg PG_AUTO_FAILOVER_VERSION=$(PG_AUTO_FAILOVER_VERSION)
42+
--build-arg PG_AUTO_FAILOVER_VERSION=$(PG_AUTO_FAILOVER_VERSION) \
43+
--build-arg POSTGRES_HLL_VERSION=$(POSTGRES_HLL_VERSION)\
44+
--build-arg PG_JOBMON_VERSION=$(PG_JOBMON_VERSION) \
45+
--build-arg PG_PARTMAN_VERSION=$(PG_PARTMAN_VERSION)
46+
4247

4348

4449
default: image

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
- [x] [Citus](https://www.citusdata.com/)
1212
- [x] [Pg Repack](https://github.com/reorg/pg_repack)
1313
- [x] [PgAutoFailover](https://github.com/hapostgres/pg_auto_failover)
14+
- [x] [PgJobmon](https://github.com/omniti-labs/pg_jobmon)
15+
- [x] [PgPartman](https://github.com/pgpartman/pg_partman)
16+
17+
1418
## Releases
1519
- [Versioning Policy](./docs/version-policy.md)
1620

bitnami/Dockerfile

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,94 @@ RUN apt-get update \
339339
/tmp/* \
340340
/var/tmp/*
341341

342+
# Install pg_jobmon
343+
ARG PG_JOBMON_VERSION
344+
RUN set -ex \
345+
&& apt-get update \
346+
&& apt-get install -y \
347+
ca-certificates \
348+
openssl \
349+
tar \
350+
wget \
351+
autoconf \
352+
automake \
353+
g++ \
354+
clang \
355+
llvm \
356+
libtool \
357+
libxml2-dev \
358+
make \
359+
perl \
360+
\
361+
&& cd /tmp\
362+
&& wget -O pg_jobmon.tar.gz "https://github.com/omniti-labs/pg_jobmon/archive/v$PG_JOBMON_VERSION.tar.gz" \
363+
&& mkdir -p /tmp/pg_jobmon \
364+
&& tar \
365+
--extract \
366+
--file pg_jobmon.tar.gz \
367+
--directory /tmp/pg_jobmon \
368+
--strip-components 1 \
369+
\
370+
&& cd /tmp/pg_jobmon \
371+
&& make \
372+
&& make install \
373+
&& cd / \
374+
&& apt-get autoremove --purge -y \
375+
wget \
376+
autoconf \
377+
automake \
378+
clang \
379+
llvm \
380+
make \
381+
perl \
382+
&& apt-get clean -y \
383+
&& rm -rf /tmp/pg_jobmon \
384+
&& rm /tmp/pg_jobmon.tar.gz
385+
386+
# Adding pg_partman
387+
ARG PG_PARTMAN_VERSION
388+
389+
RUN set -ex \
390+
&& cd /tmp\
391+
&& apt-get update \
392+
&& apt-get install -y \
393+
ca-certificates \
394+
openssl \
395+
tar \
396+
autoconf \
397+
automake \
398+
g++ \
399+
wget \
400+
clang \
401+
llvm \
402+
libtool \
403+
libxml2-dev \
404+
make \
405+
perl \
406+
&& wget -O pg_partman.tar.gz "https://github.com/pgpartman/pg_partman/archive/v$PG_PARTMAN_VERSION.tar.gz" \
407+
&& mkdir -p /tmp/pg_partman \
408+
&& tar \
409+
--extract \
410+
--file pg_partman.tar.gz \
411+
--directory /tmp/pg_partman \
412+
--strip-components 1 \
413+
&& cd /tmp/pg_partman \
414+
&& make \
415+
&& make install \
416+
# clean
417+
&& cd / \
418+
&& apt-get autoremove --purge -y \
419+
wget \
420+
autoconf \
421+
automake \
422+
clang \
423+
llvm \
424+
make \
425+
perl \
426+
&& apt-get clean -y \
427+
&& rm /tmp/pg_partman.tar.gz \
428+
&& rm -rf /tmp/pg_partman
429+
342430
USER 1001
343431

344432
ENTRYPOINT [ "/opt/bitnami/scripts/postgresql/timescaledb-bitnami-entrypoint.sh" ]

bitnami/Makefile

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ POSTGIS_VERSION=3.4.2
1111
CITUS_VERSION=12.1.0
1212
PG_REPACK_VERSION=1.5.0
1313
POSTGRES_HLL_VERSION=2.18
14+
PG_JOBMON_VERSION=1.4.1
15+
PG_PARTMAN_VERSION=5.0.1
1416
PREV_TS_VERSION=$(shell wget --quiet -O - https://raw.githubusercontent.com/timescale/timescaledb/${TS_VERSION}/version.config | grep update_from_version | sed -e 's!update_from_version = !!')
1517
PREV_TS_IMAGE="timescale/timescaledb:$(PREV_TS_VERSION)-pg$(PG_VER_NUMBER)-bitnami"
1618
PREV_IMAGE=$(shell if docker pull $(PREV_TS_IMAGE) >/dev/null; then echo "$(PREV_TS_IMAGE)"; else echo "bitnami/postgresql:$(PG_VER_NUMBER)"; fi )
@@ -31,11 +33,14 @@ DOCKER_BUILD_ARGS = --build-arg PG_VERSION=$(PG_VER_NUMBER) \
3133
--build-arg TS_VERSION=$(TS_VERSION) \
3234
--build-arg PREV_IMAGE=$(PREV_IMAGE) \
3335
--build-arg PG_CRON_VERSION=$(PG_CRON_VERSION) \
34-
--build-arg PG_REPACK_VERSION=$(PG_REPACK_VERSION) \
3536
--build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) \
36-
--build-arg POSTGRES_HLL_VERSION=$(POSTGRES_HLL_VERSION)\
37+
--build-arg PG_REPACK_VERSION=$(PG_REPACK_VERSION) \
3738
--build-arg CITUS_VERSION=$(CITUS_VERSION) \
38-
--build-arg PG_AUTO_FAILOVER_VERSION=$(PG_AUTO_FAILOVER_VERSION)
39+
--build-arg PG_AUTO_FAILOVER_VERSION=$(PG_AUTO_FAILOVER_VERSION) \
40+
--build-arg POSTGRES_HLL_VERSION=$(POSTGRES_HLL_VERSION)\
41+
--build-arg PG_JOBMON_VERSION=$(PG_JOBMON_VERSION) \
42+
--build-arg PG_PARTMAN_VERSION=$(PG_PARTMAN_VERSION)
43+
3944

4045
default: image
4146

0 commit comments

Comments
 (0)