Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

K8SPG-375: Install pg_repack and postgis by default #857

Merged
merged 5 commits into from
Nov 8, 2023
Merged

K8SPG-375: Install pg_repack and postgis by default #857

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f1d821
K8SPG-375: Install pg_repack and postgis by default
egegunes Oct 24, 2023
fa9d632
Add postgres-postgis as a separate image.
inelpandzic Nov 1, 2023
6e1c2a4
Postgis image with operator base image.
inelpandzic Nov 1, 2023
287a1fc
fix gis build
hors Nov 7, 2023
920528c
Revert 'reinstall tzdata'.
inelpandzic Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions postgresql-containers/build/postgres-postgis/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
arg basever
FROM percona/percona-postgresql-operator:${basever}-postgres
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to be able to set percona or perconalab


USER 0

COPY build/postgres-postgis/oracle-linux-ol8.repo /etc/yum.repos.d/

RUN set -ex; \
curl -Lf -o /etc/pki/rpm-gpg/RPM-GPG-KEY-oracle https://yum.oracle.com/RPM-GPG-KEY-oracle-ol8; \
microdnf -y module disable postgresql; \
microdnf -y install percona-postgis33 percona-postgis33-client;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@inelpandzic are you sure that we should not add these lines:

EXPOSE 5432

ADD bin/postgres-gis /opt/crunchy/bin/postgres

ENTRYPOINT ["/opt/crunchy/bin/uid_postgres.sh"]

USER 26

CMD ["/opt/crunchy/bin/start.sh"]

Did you test it?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll recheck it @hors , maybe you're right.

20 changes: 20 additions & 0 deletions postgresql-containers/build/postgres-postgis/oracle-linux-ol8.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
[ol8_baseos_latest]
name=Oracle Linux 8 BaseOS Latest ($basearch)
baseurl=https://yum.oracle.com/repo/OracleLinux/OL8/baseos/latest/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=1

[ol8_appstream]
name=Oracle Linux 8 Application Stream ($basearch)
baseurl=https://yum.oracle.com/repo/OracleLinux/OL8/appstream/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=1

[ol8_codeready_builder]
name=Oracle Linux 8 CodeReady Builder ($basearch) - Unsupported
baseurl=https://yum.oracle.com/repo/OracleLinux/OL8/codeready/builder/$basearch/
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-oracle
gpgcheck=1
enabled=1
5 changes: 3 additions & 2 deletions postgresql-containers/build/postgres/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,18 @@ RUN set -ex; \
percona-postgresql${PG_MAJOR//.}-plpython* \
percona-pg_stat_monitor${PG_MAJOR//.} \
percona-postgresql${PG_MAJOR//.}-llvmjit \
percona-wal2json${PG_MAJOR//.} \
percona-pg_repack${PG_MAJOR//.} \
psmisc \
rsync \
perl \
nss_wrapper \
tar \
bzip2 \
lz4 \
percona-wal2json${PG_MAJOR//.} \
file \
tzdata \
unzip; \
microdnf -y reinstall tzdata; \
# patroni block starts
# Provided by Percona
microdnf -y install \
Expand Down