Skip to content

Commit 2da7ead

Browse files
committed
Add pgvector also to Fedora container
Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent d2abce8 commit 2da7ead

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

16/Dockerfile.fedora

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/fedora/s2i-core:40
1+
FROM quay.io/fedora/s2i-core:41
22

33
# PostgreSQL image for OpenShift.
44
# Volumes:
@@ -47,7 +47,7 @@ COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
4747
RUN INSTALL_PKGS="rsync tar gettext postgresql-server postgresql-contrib nss_wrapper " && \
4848
INSTALL_PKGS+=" procps-ng util-linux postgresql-upgrade" && \
4949
INSTALL_PKGS+=" findutils xz" && \
50-
INSTALL_PKGS+=" pgaudit" && \
50+
INSTALL_PKGS+=" pgaudit pgvector" && \
5151
dnf -y --setopt=tsflags=nodocs install $INSTALL_PKGS && \
5252
rpm -V $INSTALL_PKGS && \
5353
postgres -V | grep -qe "$POSTGRESQL_VERSION\." && echo "Found VERSION $POSTGRESQL_VERSION" && \

specs/multispec.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ specs:
2424
img_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
2525
pkgs: "postgresql-server postgresql-contrib"
2626

27+
fedora41:
28+
distros:
29+
- fedora-41-x86_64
30+
s2i_base: quay.io/fedora/s2i-core
31+
org: "fedora"
32+
prod: "fedora"
33+
openshift_tags: "database,postgresql,postgresql{{ spec.short }},postgresql-{{ spec.short }}"
34+
redhat_component: "postgresql-{{ spec.short }}-container"
35+
img_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
36+
pkgs: "postgresql-server postgresql-contrib"
37+
2738
rhel8:
2839
distros:
2940
- rhel-8-x86_64
@@ -149,6 +160,6 @@ matrix:
149160
- rhel-8-x86_64
150161
- rhel-9-x86_64
151162
- centos-stream-9-x86_64
152-
- fedora-40-x86_64
163+
- fedora-41-x86_64
153164
- centos-stream-10-x86_64
154165
- rhel-10-x86_64

src/Dockerfile.fedora

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{% if spec.version == "16" or spec.version == "15" %}
2-
FROM quay.io/fedora/s2i-core:40
1+
{% if spec.version == "16" %}
2+
FROM quay.io/fedora/s2i-core:41
33
{% else %}
4-
FROM quay.io/fedora/s2i-core:38
4+
FROM quay.io/fedora/s2i-core:40
55
{% endif %}
66

77
# PostgreSQL image for OpenShift.
@@ -56,7 +56,7 @@ RUN INSTALL_PKGS="rsync tar gettext postgresql{{ spec.short }}-server postgresql
5656
{% endif %}
5757
INSTALL_PKGS+=" findutils xz" && \
5858
{% if spec.version == "16" %}
59-
INSTALL_PKGS+=" pgaudit" && \
59+
INSTALL_PKGS+=" pgaudit pgvector" && \
6060
{% else %}
6161
INSTALL_PKGS+=" postgresql{{ spec.short }}-pgaudit" && \
6262
{% endif %}

test/run_test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1053,7 +1053,7 @@ run_pgvector_test()
10531053
*) ;;
10541054
esac
10551055
case ${OS} in
1056-
fedora|rhel8)
1056+
rhel8)
10571057
echo "pgvector not expected, test skipped."; return ;;
10581058
*) ;;
10591059
esac

0 commit comments

Comments
 (0)