diff --git a/Dockerfile-15 b/Dockerfile-15 index 204a563cd..62e0308df 100644 --- 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 diff --git a/Dockerfile-17 b/Dockerfile-17 index 916feb933..6c2f1c6bf 100644 --- 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 diff --git a/Dockerfile-orioledb-17 b/Dockerfile-orioledb-17 index 7bf265a68..b242a8527 100644 --- 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 diff --git a/ansible/tasks/setup-pgbouncer.yml b/ansible/tasks/setup-pgbouncer.yml index 576061302..a796f98d1 100644 --- 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-wal-g.yml b/ansible/tasks/setup-wal-g.yml index e453024aa..7f8048f90 100644 --- 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 index 85e3a7a85..84035bca5 100644 --- 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-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 diff --git a/nix/checks.nix b/nix/checks.nix index 0a1ab9d8e..0bc5261b7 100644 --- 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 index c8eb02ef0..0f5f43ffe 100644 --- 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 index 37f4addb7..07e6eb572 100644 --- 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"; - }; }