refactor: Remove wal-g v3 and simplify build (#1937)

* refactor: Remove wal-g v3 and simplify build

- Removes the `wal-g-3` Nix package definition and all associated build/installation steps from Dockerfiles and Ansible playbooks.
- Standardizes on `wal-g-2` as the sole WAL-G version used, simplifying the build process and reducing complexity.
- Cleans up related checks and package definitions in Nix.

* chore: Add wal-g nix garbage collection

- Executes `nix-collect-garbage -d` after installing wal-g via nix profile.
- This ensures cleanup of the Nix store, freeing up disk space.

* chore: Update apt cache for Pgbouncer dependencies

Removes `cache_valid_time: 3600` from the apt task for Pgbouncer dependencies.

This ensures that `apt update` is executed every time the playbook runs, guaranteeing the system fetches the latest package lists before installing Pgbouncer and its dependencies. This prevents potential installation failures caused by an outdated package cache.

* chore: Update PostgreSQL release versions

Removes the `-INDATA257` suffix from the PostgreSQL release version strings in `ansible/vars.yml`. This aligns the versions closer to standard upstream releases.

Author: hunleyd

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

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

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

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:

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'

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-INDATA257"
-  postgres17: "17.6.1.057-INDATA257"
-  postgres15: "15.14.1.057-INDATA257"
+  postgresorioledb-17: "17.6.0.014-orioledb"
+  postgres17: "17.6.1.057"
+  postgres15: "15.14.1.057"
 
 # Non Postgres Extensions
 pgbouncer_release: 1.19.0

nix/checks.nix

@@ -391,7 +391,6 @@
           );
           inherit (self'.packages)
             wal-g-2
-            wal-g-3
             dbmate-tool
             packer
             pg_regress

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

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";
-  };
 }