Merge branch 'develop' into sam/2-stage-ami-nix

Author: samrose

.github/CODEOWNERS

@@ -1,4 +1,4 @@
 * @supabase/backend
 migrations/ @supabase/cli @supabase/backend
-docker/orioledb @supabase/postgres
+docker/orioledb @supabase/postgres @supabase/backend
 common.vars.pkr.hcl @supabase/postgres @supabase/backend

Dockerfile

@@ -557,7 +557,7 @@ FROM ccache as libsodium
 ARG libsodium_release
 ARG libsodium_release_checksum
 ADD --checksum=${libsodium_release_checksum} \
-    "https://download.libsodium.org/libsodium/releases/libsodium-${libsodium_release}.tar.gz" \
+    "https://supabase-public-artifacts-bucket.s3.amazonaws.com/libsodium/libsodium-${libsodium_release}.tar.gz" \
     /tmp/libsodium.tar.gz
 RUN tar -xvf /tmp/libsodium.tar.gz -C /tmp && \
     rm -rf /tmp/libsodium.tar.gz

ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh

@@ -306,6 +306,8 @@ EOF
     echo "11. Copying custom configurations"
     mkdir -p "$MOUNT_POINT/conf"
     cp -R /etc/postgresql-custom/* "$MOUNT_POINT/conf/"
+    # removing supautils config as to allow the latest one provided by the latest image to be used
+    rm -f "$MOUNT_POINT/conf/supautils.conf" || true
 
     # removing wal-g config as to allow it to be explicitly enabled on the new instance
     rm -f "$MOUNT_POINT/conf/wal-g.conf"

ansible/tasks/finalize-ami.yml

@@ -67,7 +67,7 @@
   shell:
     cmd: |
         cp  /usr/lib/systemd/system/logrotate.timer /etc/systemd/system/logrotate.timer
-        sed -i -e 's;daily;*:0/10;' /etc/systemd/system/logrotate.timer
+        sed -i -e 's;daily;*:0/5;' /etc/systemd/system/logrotate.timer
         systemctl reenable logrotate.timer
   become: yes
 

ansible/tasks/postgres-extensions/18-pgsodium.yml

@@ -7,7 +7,7 @@
 
 - name: libsodium - download libsodium
   get_url:
-    url: "https://download.libsodium.org/libsodium/releases/libsodium-{{ libsodium_release }}.tar.gz"
+    url: "https://supabase-public-artifacts-bucket.s3.amazonaws.com/libsodium/libsodium-{{ libsodium_release }}.tar.gz"
     dest: /tmp/libsodium-{{ libsodium_release }}.tar.gz
     checksum: "{{ libsodium_release_checksum }}"
     timeout: 60

ansible/vars.yml

@@ -46,7 +46,7 @@ postgres_exporter_release_checksum:
   arm64: sha256:29ba62d538b92d39952afe12ee2e1f4401250d678ff4b354ff2752f4321c87a0
   amd64: sha256:cb89fc5bf4485fb554e0d640d9684fae143a4b2d5fa443009bd29c59f9129e84
 
-adminapi_release: 0.63.3
+adminapi_release: 0.63.5
 adminmgr_release: 0.19.0
 
 # Postgres Extensions

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.1.41"
+postgres-version = "15.1.1.42"

docker/all-in-one/Dockerfile

@@ -3,7 +3,7 @@ ARG postgres_version=15.1.1.24
 ARG pgbouncer_release=1.18.0
 ARG postgrest_release=10.1.2
 ARG gotrue_release=2.130.0
-ARG adminapi_release=0.63.2
+ARG adminapi_release=0.63.5
 ARG adminmgr_release=0.19.0
 ARG vector_release=0.22.3
 ARG postgres_exporter_release=0.15.0
@@ -276,6 +276,7 @@ RUN mkdir -p /var/log/wal-g \
     && chown adminapi:adminapi /etc/wal-g/config.json \
     && echo '{"WALG_S3_PREFIX": "s3://foo/bar/"}' > /etc/wal-g/config.json
 RUN chown -R adminapi:adminapi /etc/adminapi
+RUN sed -i "s;#include = '/etc/postgresql-custom/generated-optimizations.conf';include = '/etc/postgresql-custom/generated-optimizations.conf';" /etc/postgresql/postgresql.conf
 
 # Add healthcheck and entrypoint scripts
 COPY docker/all-in-one/healthcheck.sh /usr/local/bin/

docker/orioledb/Dockerfile

@@ -512,7 +512,7 @@ FROM ccache as libsodium
 ARG libsodium_release
 ARG libsodium_release_checksum
 ADD --checksum=${libsodium_release_checksum} \
-    "https://download.libsodium.org/libsodium/releases/libsodium-${libsodium_release}.tar.gz" \
+    "https://supabase-public-artifacts-bucket.s3.amazonaws.com/libsodium/libsodium-${libsodium_release}.tar.gz" \
     /tmp/libsodium.tar.gz
 RUN tar -xvf /tmp/libsodium.tar.gz -C /tmp && \
     rm -rf /tmp/libsodium.tar.gz

flake.nix

@@ -53,6 +53,7 @@
             # want to have an arbitrary order, since it might matter. being
             # explicit is better.
             (import ./nix/overlays/cargo-pgrx-0-11-3.nix)
+            # (import ./nix/overlays/postgis.nix)
             #(import ./nix/overlays/gdal-small.nix)
 
           ];