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.

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

Update Dockerfile.rhel8 to fix the postgresql upgrade issue from v12 to v13. #456

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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 src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ FROM {{ spec.s2i_base }}
# PostgreSQL administrative account

ENV POSTGRESQL_VERSION={{ spec.version }} \
{% if spec.prod != "rhel8" or spec.prod != "rhel9" or spec.version == "10" %}
{% if spec.prod != "rhel8" or spec.prod != "rhel9" or spec.version == "10" or spec.version == "13" %}
POSTGRESQL_PREV_VERSION={{ spec.prev_version }} \
{% endif %}
HOME=/var/lib/pgsql \
Expand Down
2 changes: 1 addition & 1 deletion test/run_test
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ run_upgrade_test ()
{
# Do not run on Fedora or RHEL8 until the upgrade script
# is fixed for non-SCL use cases
{ [ "${OS}" == "fedora" ] || [ "${OS}" == "rhel8" ]; } && return 0
{ [ "${OS}" == "fedora" ] } && return 0
phracek marked this conversation as resolved.
Show resolved Hide resolved

local upgrade_path="none 9.2 9.4 9.5 9.6 10 12 13 none" prev= act=
for act in $upgrade_path; do
Expand Down