From 91c10fc4bb4e61788460f585b5c9433499a08478 Mon Sep 17 00:00:00 2001 From: Artur Zakirov Date: Thu, 13 Aug 2026 17:17:40 +0200 Subject: [PATCH] feat: Add ORIOLEDB_ENABLED into /etc/environment.d/postgresql.env database-optimizations.service ignores ORIOLEDB_ENABLED variabled, which is defined in /etc/environment. This commit adds it into /etc/environment.d/postgresql.env similar to other variables and explicitely use it in the database-optimizations.service similar to postgresql.service. We keep /etc/environment unchanged for backward compatibility. --- ansible/files/database-optimizations.service | 1 + ansible/tasks/stage2-setup-postgres.yml | 5 +++++ ansible/vars.yml | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ansible/files/database-optimizations.service b/ansible/files/database-optimizations.service index f25fc09c69..11bb80d529 100644 --- a/ansible/files/database-optimizations.service +++ b/ansible/files/database-optimizations.service @@ -3,6 +3,7 @@ Description=Postgresql optimizations [Service] Type=oneshot +EnvironmentFile=/etc/environment.d/postgresql.env # we do not want failures from these commands to cause downstream service startup to fail ExecStart=-/opt/supabase-admin-api optimize db --destination-config-file-path /etc/postgresql-custom/generated-optimizations.conf ExecStart=-/opt/supabase-admin-api optimize pgbouncer --destination-config-file-path /etc/pgbouncer-custom/generated-optimizations.ini diff --git a/ansible/tasks/stage2-setup-postgres.yml b/ansible/tasks/stage2-setup-postgres.yml index 1a2bd9d9e6..3019fa829e 100644 --- a/ansible/tasks/stage2-setup-postgres.yml +++ b/ansible/tasks/stage2-setup-postgres.yml @@ -53,6 +53,11 @@ line: 'ORIOLEDB_ENABLED=true' path: '/etc/environment' + - name: Add ORIOLEDB_ENABLED environment variable to postgresql.env + ansible.builtin.lineinfile: + line: 'ORIOLEDB_ENABLED=true' + path: '/etc/environment.d/postgresql.env' + - name: Execute things when stage2 when: stage2 become: true diff --git a/ansible/vars.yml b/ansible/vars.yml index f9491fa707..33b705fdee 100644 --- a/ansible/vars.yml +++ b/ansible/vars.yml @@ -11,9 +11,9 @@ postgres_major: # This is the source of truth for Postgres versions used in the Dockerfiles, and # is used to derive image tags and base images in the release matrix. postgres_release: - postgresorioledb-17: "17.9.0.014-orioledb" - postgres17: "17.6.1.161" - postgres15: "15.14.1.161" + postgresorioledb-17: "17.9.0.015-orioledb" + postgres17: "17.6.1.162" + postgres15: "15.14.1.162" # Docker release matrix — base images built first, layered images built on top. # tag and base_tag are derived at build time from postgres_release via release_key. # tag_suffix is appended to the release version to form the final image tag.