Skip to content

chore: switch to PostgreSQL 18 in dev env #2447

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

Open
jdobes wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: switch to PostgreSQL 18 in dev env #2447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/container-publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ env:
REGISTRY: quay.io
# github.repository as <account>/<repo>
IMAGE_NAME: "iop/vulnerability-engine"
ALT_REPO: "https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-16/repo/epel-9/group_insights-postgresql-16-epel-9.repo"
ALT_REPO: "https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-18/repo/rhel-9/group_insights-postgresql-18-rhel-9.repo"


jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/platsec-security-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# base_dockerbuild_path: './testbuild.base'
# base_dockerfile_path: './test'
# base_dockerfile_name: 'Dockerfile.base'
build_arg: '--build-arg ALT_REPO="https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-16/repo/epel-9/group_insights-postgresql-16-epel-9.repo"'
build_arg: '--build-arg ALT_REPO="https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-18/repo/rhel-9/group_insights-postgresql-18-rhel-9.repo"'
# only_fixed: true
# fail_on_vulns: true
# severity_fail_cutoff: high
2 changes: 1 addition & 1 deletion .pg_repack
Open in desktop
Submodule .pg_repack updated 8 files
+5 −0 .github/workflows/regression.yml
+1 −0 .gitignore
+2 −2 META.json
+85 −54 bin/pg_repack.c
+11 −7 doc/pg_repack.rst
+9 −10 doc/pg_repack_jp.rst
+1 −5 regress/expected/nosuper.out
+1 −5 regress/expected/nosuper_1.out
6 changes: 2 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
ARG ALT_REPO


RUN (dnf module enable -y postgresql:16 || curl -o /etc/yum.repos.d/postgresql.repo $ALT_REPO) && \
RUN (dnf module enable -y postgresql:18 || curl -o /etc/yum.repos.d/postgresql.repo $ALT_REPO) && \
dnf install -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \
python312 python3.12-pip python3.12-devel \
gcc make redhat-rpm-config file kernel-srpm-macros go-srpm-macros \
Expand Down Expand Up @@ -35,11 +35,9 @@
# runtime image
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1786323074@sha256:57c8151c51445a07e503dab9dc9211dc3cdeac9d45ed81a10954b7d770659b3b AS runtimeimg
ARG ALT_REPO
# support for alternative RPM name (in case not compatible version available in RHEL)
ARG PG_REPACK_RPM=pg_repack-1.5.1

# Install PostgreSQL without pg_repack (will copy from builder)
RUN (microdnf module enable -y postgresql:16 || curl -o /etc/yum.repos.d/postgresql.repo $ALT_REPO) && \
RUN (microdnf module enable -y postgresql:18 || curl -o /etc/yum.repos.d/postgresql.repo $ALT_REPO) && \
microdnf install -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \
python312 libpq shadow-utils git-core postgresql && \
microdnf clean all
Expand All @@ -65,7 +63,7 @@

# Baked-in content for FedRAMP
ARG STATIC_ASSETS=0
ARG GIT_TOKEN=""

Check warning on line 66 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

Sensitive data should not be used in the ARG or ENV commands 

SecretsUsedInArgOrEnv: Do not use ARG or ENV instructions for sensitive data (ARG "GIT_TOKEN")
More info: https://docs.docker.com/go/dockerfile/rule/secrets-used-in-arg-or-env/
RUN if [ "${STATIC_ASSETS}" == 1 ] ; then \
curl -o /etc/pki/ca-trust/source/anchors/2022-IT-Root-CA.crt https://certs.corp.redhat.com/certs/2022-IT-Root-CA.pem && \
update-ca-trust extract && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal

RUN curl -o /etc/yum.repos.d/postgresql.repo \
https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-16/repo/epel-9/group_insights-postgresql-16-epel-9.repo
https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-18/repo/rhel-9/group_insights-postgresql-18-rhel-9.repo

RUN microdnf install -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \
python312 python3.12-pip python3.12-devel libpq-devel gcc git postgresql-server which findutils diffutils && \
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ services:
context: .
dockerfile: Dockerfile.test
args:
- ALT_REPO=https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-16/repo/epel-9/group_insights-postgresql-16-epel-9.repo
- ALT_REPO=https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-18/repo/rhel-9/group_insights-postgresql-18-rhel-9.repo
command: bash -c "cd /engine && ./run_tests.sh"
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ services:
- "-c"
- "timezone=UTC"
container_name: vulnerability-engine-database
image: docker.io/library/postgres:16
image: docker.io/library/postgres:18
restart: unless-stopped
env_file:
- ./conf/common.env
- ./conf/database.env
ports:
- 15432:5432
volumes:
- vulnerability-engine-db-data:/var/lib/postgresql/data
- vulnerability-engine-db-data:/var/lib/postgresql

ve_database_init:
command: >
Expand All @@ -34,7 +34,7 @@ services:
context: ./
dockerfile: ./Dockerfile
args:
- ALT_REPO=https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-16/repo/epel-9/group_insights-postgresql-16-epel-9.repo
- ALT_REPO=https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-18/repo/rhel-9/group_insights-postgresql-18-rhel-9.repo
image: vulnerability-engine-app:latest
restart: unless-stopped
env_file:
Expand Down
2 changes: 1 addition & 1 deletion platform_mock/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal

RUN curl -o /etc/yum.repos.d/postgresql.repo \
https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-16/repo/epel-9/group_insights-postgresql-16-epel-9.repo
https://copr.fedorainfracloud.org/coprs/g/insights/postgresql-18/repo/rhel-9/group_insights-postgresql-18-rhel-9.repo

RUN microdnf install -y --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \
python312 python3.12-pip python3.12-devel libpq-devel gcc which java-openjdk-headless shadow-utils tar gzip file vim systemd libicu postgresql && \
Expand Down
2 changes: 1 addition & 1 deletion rpms.in.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ contentOrigin:
arches: [x86_64]

moduleEnable:
- postgresql:16
- postgresql:18
58 changes: 29 additions & 29 deletions rpms.lock.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,41 +711,41 @@ arches:
name: perl-vars
evr: 1.05-481.1.el9_6
sourcerpm: perl-5.32.1-481.1.el9_6.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.x86_64.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-18.4-2.module+el9.8.0+24359+da7fad50.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 2058539
checksum: sha256:9325e51249f2c5c94ebe82805f66e37574f6757504b394f4c1ee44733a4d7b2d
size: 2155327
checksum: sha256:fa4fe5e4d4e9df24295ce6910c4f085c8938b0b44853495fc3c85c42828dbc5f
name: postgresql
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-private-devel-16.14-1.module+el9.8.0+24360+ff98e86a.x86_64.rpm
evr: 18.4-2.module+el9.8.0+24359+da7fad50
sourcerpm: postgresql-18.4-2.module+el9.8.0+24359+da7fad50.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-private-devel-18.4-2.module+el9.8.0+24359+da7fad50.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 70889
checksum: sha256:ec555a03c31125936b1e5af2da6a21477661c0cca4ce3e8a0a74d89756084441
size: 72777
checksum: sha256:08f64edcd89c35a4e2dc9a731e2f36cc1fb49b4210c4a62397f036dfb22dd91e
name: postgresql-private-devel
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-private-libs-16.14-1.module+el9.8.0+24360+ff98e86a.x86_64.rpm
evr: 18.4-2.module+el9.8.0+24359+da7fad50
sourcerpm: postgresql-18.4-2.module+el9.8.0+24359+da7fad50.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-private-libs-18.4-2.module+el9.8.0+24359+da7fad50.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 153300
checksum: sha256:c637e020443076818c6b8d271fc49090f52fef850b12aa3f1068d695293b9991
size: 167946
checksum: sha256:71f7e51e54c450532e656cbcd3b14e9454cc584076d6bf6e475369d4ad4ba1ec
name: postgresql-private-libs
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-server-devel-16.14-1.module+el9.8.0+24360+ff98e86a.x86_64.rpm
evr: 18.4-2.module+el9.8.0+24359+da7fad50
sourcerpm: postgresql-18.4-2.module+el9.8.0+24359+da7fad50.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-server-devel-18.4-2.module+el9.8.0+24359+da7fad50.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 1575038
checksum: sha256:70899fe08c7fea070a29da5e17b3daaeefb53575d8ead2115310528954336da6
size: 1718171
checksum: sha256:b37432a71f184cd882ff043846f7adebfa6de4fba35ec6b31817ee85d827ce50
name: postgresql-server-devel
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-static-16.14-1.module+el9.8.0+24360+ff98e86a.x86_64.rpm
evr: 18.4-2.module+el9.8.0+24359+da7fad50
sourcerpm: postgresql-18.4-2.module+el9.8.0+24359+da7fad50.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/postgresql-static-18.4-2.module+el9.8.0+24359+da7fad50.x86_64.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 142246
checksum: sha256:e845003f8f93f8a9e2b6af067dbfb41ed775cb5e01e47238768f5a67054fb3d5
size: 199015
checksum: sha256:34b6e6c7f0f092fdd89312ce99fad96988d7ef554ffe4416cc4be0f8202b33ec
name: postgresql-static
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
sourcerpm: postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
evr: 18.4-2.module+el9.8.0+24359+da7fad50
sourcerpm: postgresql-18.4-2.module+el9.8.0+24359+da7fad50.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/p/pyproject-srpm-macros-1.18.5-1.el9.noarch.rpm
repoid: rhel-9-for-x86_64-appstream-rpms
size: 12794
Expand Down Expand Up @@ -1496,12 +1496,12 @@ arches:
checksum: sha256:05990bf148e58515223b0936ee7b621e5d39bb875e2481a4d84522bd4b57d4e3
name: perl-srpm-macros
evr: 1-41.el9
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/source/SRPMS/Packages/p/postgresql-16.14-1.module+el9.8.0+24360+ff98e86a.src.rpm
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/source/SRPMS/Packages/p/postgresql-18.4-2.module+el9.8.0+24359+da7fad50.src.rpm
repoid: rhel-9-for-x86_64-appstream-source-rpms
size: 48442323
checksum: sha256:a6e5d5ae3807b707632863dd9f2c628d7b269710433ab0af08ab65ee678b8e45
size: 47663882
checksum: sha256:7e6722b01c3aade7be4f1b6f5ac81085fd7c1f72bf9320415de0c785e619a704
name: postgresql
evr: 16.14-1.module+el9.8.0+24360+ff98e86a
evr: 18.4-2.module+el9.8.0+24359+da7fad50
- url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/source/SRPMS/Packages/p/pyproject-rpm-macros-1.18.5-1.el9.src.rpm
repoid: rhel-9-for-x86_64-appstream-source-rpms
size: 285920
Expand Down
Loading