Merge branch 'develop' into multi-version-ext/pg-partman

encima · web-flow · commit 2e70b74eb589 · 2025-12-03T17:28:48.000+02:00
diff --git a/Dockerfile-15 b/Dockerfile-15
@@ -159,18 +159,6 @@ RUN bash -c 'source /usr/local/bin/apt-update-fallback.sh && apt_update_with_fal
 
 ENV PGDATA=/var/lib/postgresql/data
 
-####################
-# setup-wal-g.yml
-####################
-FROM base as walg
-ARG wal_g_release
-WORKDIR /nixpg
-
-RUN nix profile install .#wal-g-3 && \
-    ln -s /nix/var/nix/profiles/default/bin/wal-g-3 /tmp/wal-g
-
-RUN nix store gc
-
 WORKDIR /
 ####################
 # setup-groonga
@@ -215,7 +203,6 @@ RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $GOSU_GPG_KEY &&
 FROM gosu as production
 RUN id postgres || (echo "postgres user does not exist" && exit 1)
 # # Setup extensions
-COPY --from=walg /tmp/wal-g /usr/local/bin/
 COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
 
 # # Initialise configs
@@ -237,8 +224,6 @@ RUN sed -i \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     -e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \
-    echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
-    #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
     echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \    
     echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
     usermod -aG postgres wal-g && \
diff --git a/Dockerfile-17 b/Dockerfile-17
@@ -163,19 +163,6 @@ RUN bash -c 'source /usr/local/bin/apt-update-fallback.sh && apt_update_with_fal
 
 ENV PGDATA=/var/lib/postgresql/data
 
-####################
-# setup-wal-g.yml
-####################
-FROM base as walg
-ARG wal_g_release
-
-WORKDIR /nixpg
-
-RUN nix profile install .#wal-g-3 && \
-    ln -s /nix/var/nix/profiles/default/bin/wal-g-3 /tmp/wal-g
-
-RUN nix store gc
-
 WORKDIR /
 ####################
 # setup-groonga
@@ -220,7 +207,6 @@ RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $GOSU_GPG_KEY &&
 FROM gosu as production
 RUN id postgres || (echo "postgres user does not exist" && exit 1)
 # # Setup extensions
-COPY --from=walg /tmp/wal-g /usr/local/bin/
 COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
 
 # # Initialise configs
@@ -242,8 +228,6 @@ RUN sed -i \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     -e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \
-    echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
-    #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
     echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
     echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
     usermod -aG postgres wal-g && \
diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17
@@ -163,19 +163,6 @@ RUN bash -c 'source /usr/local/bin/apt-update-fallback.sh && apt_update_with_fal
 
 ENV PGDATA=/var/lib/postgresql/data
 
-####################
-# setup-wal-g.yml
-####################
-FROM base as walg
-ARG wal_g_release
-
-WORKDIR /nixpg
-
-RUN nix profile install .#wal-g-3 && \
-    ln -s /nix/var/nix/profiles/default/bin/wal-g-3 /tmp/wal-g
-
-RUN nix store gc
-
 WORKDIR /
 ####################
 # setup-groonga
@@ -220,7 +207,6 @@ RUN gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys $GOSU_GPG_KEY &&
 FROM gosu as production
 RUN id postgres || (echo "postgres user does not exist" && exit 1)
 # # Setup extensions
-COPY --from=walg /tmp/wal-g /usr/local/bin/
 COPY --from=groonga /tmp/groonga-plugins/plugins /usr/lib/groonga/plugins
 
 # # Initialise configs
@@ -242,8 +228,6 @@ RUN sed -i \
     -e "s|#session_preload_libraries = ''|session_preload_libraries = 'supautils'|g" \
     -e "s|#include = '/etc/postgresql-custom/supautils.conf'|include = '/etc/postgresql-custom/supautils.conf'|g" \
     -e "s|#include = '/etc/postgresql-custom/wal-g.conf'|include = '/etc/postgresql-custom/wal-g.conf'|g" /etc/postgresql/postgresql.conf && \
-    echo "cron.database_name = 'postgres'" >> /etc/postgresql/postgresql.conf && \
-    #echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-${TARGETARCH}/lib/server/libjvm.so'" >> /etc/postgresql/postgresql.conf && \
     echo "pgsodium.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
     echo "vault.getkey_script= '/usr/lib/postgresql/bin/pgsodium_getkey.sh'" >> /etc/postgresql/postgresql.conf && \
     usermod -aG postgres wal-g && \
diff --git a/README.md b/README.md
@@ -294,7 +294,7 @@ This is the same PostgreSQL build that powers [Supabase](https://supabase.io), b
 | Goodie | Version | Description |
 | ------------- | :-------------: | ------------- |
 | [PgBouncer](https://www.pgbouncer.org/) | [1.19.0](http://www.pgbouncer.org/changelog.html#pgbouncer-119x) | Set up Connection Pooling. |
-| [PostgREST](https://postgrest.org/en/stable/) | [v13.0.4](https://github.com/PostgREST/postgrest/releases/tag/v13.0.4) | Instantly transform your database into an RESTful API. |
+| [PostgREST](https://postgrest.org/en/stable/) | [v14.1](https://github.com/PostgREST/postgrest/releases/tag/v14.1) | Instantly transform your database into an RESTful API. |
 | [WAL-G](https://github.com/wal-g/wal-g#wal-g) | [v2.0.1](https://github.com/wal-g/wal-g/releases/tag/v2.0.1) | Tool for physical database backup and recovery. | -->
 
 
diff --git a/ansible/files/postgresql_config/conf.d/pg_cron.conf b/ansible/files/postgresql_config/conf.d/pg_cron.conf
@@ -0,0 +1 @@
+cron.database_name = 'postgres'
diff --git a/ansible/files/postgresql_config/postgresql.conf.j2 b/ansible/files/postgresql_config/postgresql.conf.j2
@@ -773,4 +773,3 @@ include_dir = '/etc/postgresql-custom/conf.d'  # include files ending in '.conf'
 #------------------------------------------------------------------------------
 
 # Add settings for extensions here
-cron.database_name = 'postgres'
diff --git a/ansible/tasks/finalize-ami.yml b/ansible/tasks/finalize-ami.yml
@@ -11,7 +11,7 @@
     src: "files/postgresql_config/conf.d/{{ ext_item }}.conf"
   loop:
     - auto_explain
-    # - pg_cron
+    - pg_cron
   loop_control:
     loop_var: 'ext_item'
 
diff --git a/ansible/tasks/setup-pgbouncer.yml b/ansible/tasks/setup-pgbouncer.yml
@@ -8,7 +8,6 @@
       - libsystemd-dev
       - pkg-config
     update_cache: true
-    cache_valid_time: 3600
 
 - name: PgBouncer - download latest release
   ansible.builtin.get_url:
diff --git a/ansible/tasks/setup-postgrest.yml b/ansible/tasks/setup-postgrest.yml
@@ -4,9 +4,11 @@
     state: 'present'
 
 - name: PostgREST - add Postgres PPA gpg key
-  ansible.builtin.apt_key:
+  ansible.builtin.get_url:
+    dest: /etc/apt/trusted.gpg.d/ppdg.asc
+    force: true
+    mode: '0644'
     url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
-    state: 'present'
 
 - name: PostgREST - add Postgres PPA main
   ansible.builtin.apt_repository:
@@ -30,9 +32,9 @@
     msg: "Installed libpq5 version: {{ ansible_facts['packages']['libpq5'][0]['version'] }}"
 
 - name: PostgREST - remove Postgres PPA gpg key
-  ansible.builtin.apt_key:
+  ansible.builtin.file:
+    path: /etc/apt/trusted.gpg.d/ppdg.asc
     state: 'absent'
-    url: 'https://www.postgresql.org/media/keys/ACCC4CF8.asc'
 
 - name: PostgREST - remove Postgres PPA
   ansible.builtin.apt_repository:
@@ -58,7 +60,7 @@
       {%- if platform == "arm64" -%}
         ubuntu-aarch64
       {%- elif platform == "amd64" -%}
-        inux-static-x86-64
+        linux-static-x86-64
       {%- endif -%}
 
 - name: PostgREST - unpack archive in /opt
diff --git a/ansible/tasks/setup-system.yml b/ansible/tasks/setup-system.yml
@@ -154,6 +154,13 @@
         value: 60
         state: 'present'
 
+    # postgres_exporter runs on port 9187 and postgresT occasionlly chooses it as random srcport
+    - name: Set net.ipv4.ip_local_reserved_ports=9187
+      ansible.builtin.sysctl:
+        name: 'net.ipv4.ip_local_reserved_ports'
+        value: 9187
+        state: 'present'
+
 - name: Execute tasks when (debpkg_mode or nixpkg_mode)
   when:
     - (debpkg_mode or nixpkg_mode)
diff --git a/ansible/tasks/setup-wal-g.yml b/ansible/tasks/setup-wal-g.yml
@@ -38,24 +38,6 @@
         cmd: sudo -u ubuntu bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix-collect-garbage -d"
       become: true
 
-    - name: Install wal-g 3 from nix binary cache
-      ansible.builtin.shell:
-        cmd: sudo -u wal-g bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix profile install github:supabase/postgres/{{ git_commit_sha }}#wal-g-3"
-      become: true
-
-    - name: nix collect garbage
-      ansible.builtin.shell:
-        cmd: sudo -u ubuntu bash -c ". /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh && nix-collect-garbage -d"
-      become: true
-
-    - name: Create symlink for wal-g-3 from Nix profile to /usr/local/bin
-      ansible.builtin.file:
-        dest: '/usr/local/bin/wal-g-v3'
-        force: true
-        src: '/home/wal-g/.nix-profile/bin/wal-g-3'
-        state: 'link'
-      become: true
-
     - name: Create symlink to make wal-g-v2 the default wal-g
       ansible.builtin.file:
         dest: '/usr/local/bin/wal-g'
diff --git a/ansible/vars.yml b/ansible/vars.yml
@@ -10,9 +10,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-  postgresorioledb-17: "17.6.0.014-orioledb"
-  postgres17: "17.6.1.057"
-  postgres15: "15.14.1.057"
+  postgresorioledb-17: "17.6.0.016-orioledb"
+  postgres17: "17.6.1.059"
+  postgres15: "15.14.1.059"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0
@@ -21,9 +21,9 @@ pgbouncer_release_checksum: sha256:af0b05e97d0e1fd9ad45fe00ea6d2a934c63075f67f7e
 # The checksum can be found under "Assets", in the GitHub release page for each version.
 # The binaries used are: ubuntu-aarch64 and linux-static.
 # https://github.com/PostgREST/postgrest/releases
-postgrest_release: 13.0.5
-postgrest_arm_release_checksum: sha256:7b4eafdaf76bc43b57f603109d460a838f89f949adccd02f452ca339f9a0a0d4
-postgrest_x86_release_checksum: sha256:05be2bd48abee6c1691fc7c5d005023466c6989e41a4fc7d1302b8212adb88b5
+postgrest_release: 14.1
+postgrest_arm_release_checksum: sha256:68885d936873059b946afadaae697467daedacd7d8e697a80b7f0f6881c9c92f
+postgrest_x86_release_checksum: sha256:bdab6ab3389ca0d6c1f3b8363491674dbca71875c3f30261d92d8fecdde35277
 
 gotrue_release: 2.182.1
 gotrue_release_checksum: sha1:38a12109ad62df32460d88e4c7b2a475b88e7865
@@ -53,7 +53,7 @@ postgres_exporter_release_checksum:
   arm64: sha256:29ba62d538b92d39952afe12ee2e1f4401250d678ff4b354ff2752f4321c87a0
   amd64: sha256:cb89fc5bf4485fb554e0d640d9684fae143a4b2d5fa443009bd29c59f9129e84
 
-adminapi_release: "0.93.0"
+adminapi_release: "0.93.1"
 adminmgr_release: "0.32.3"
 supabase_admin_agent_release: 1.6.0
 supabase_admin_agent_splay: 30s
diff --git a/nix/checks.nix b/nix/checks.nix
@@ -391,7 +391,6 @@
           );
           inherit (self'.packages)
             wal-g-2
-            wal-g-3
             dbmate-tool
             packer
             pg_regress
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
@@ -68,7 +68,7 @@
           sync-exts-versions = pkgs.callPackage ./sync-exts-versions.nix { inherit (inputs') nix-editor; };
           trigger-nix-build = pkgs.callPackage ./trigger-nix-build.nix { };
           update-readme = pkgs.callPackage ./update-readme.nix { };
-          inherit (pkgs.callPackage ./wal-g.nix { }) wal-g-2 wal-g-3;
+          inherit (pkgs.callPackage ./wal-g.nix { }) wal-g-2;
           inherit (pkgs.cargo-pgrx)
             cargo-pgrx_0_11_3
             cargo-pgrx_0_12_6
diff --git a/nix/packages/wal-g.nix b/nix/packages/wal-g.nix
@@ -77,12 +77,4 @@ in
     vendorHash = "sha256-BbQuY6r30AkxlCZjY8JizaOrqEBdv7rIQet9KQwYB/g=";
     majorVersion = "2";
   };
-
-  # wal-g v3.0.5
-  wal-g-3 = walGCommon {
-    version = "3.0.5";
-    sha256 = "sha256-wVr0L2ZXMuEo6tc2ajNzPinVQ8ZVzNOSoaHZ4oFsA+U=";
-    vendorHash = "sha256-YDLAmRfDl9TgbabXj/1rxVQ052NZDg3IagXVTe5i9dw=";
-    majorVersion = "3";
-  };
 }

Original file line number	Diff line number	Diff line change
`@@ -773,4 +773,3 @@ include_dir = '/etc/postgresql-custom/conf.d' # include files ending in '.conf'`
`773`	`773`	`#------------------------------------------------------------------------------`
`774`	`774`
`775`	`775`	`# Add settings for extensions here`
`776`		`-cron.database_name = 'postgres'`