install plrust as a standalone step due to runtime deps

Author: olirice

Dockerfile

@@ -37,10 +37,6 @@ ARG pgvector_release=0.4.0
 ARG pg_tle_release=1.0.3
 ARG supautils_release=1.7.2
 ARG wal_g_release=2.0.1
-ARG plrust_release=1.2.3
-ARG plrust_release_checksum
-ARG plrust_language_version=1.70.0
-ARG plrust_pgrx_version=0.9.7
 
 
 ####################
@@ -801,15 +797,6 @@ RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccac
 # Create debian package
 RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc
 
-####################
-# 30-plrust.yml
-####################
-FROM base as plrust-source
-ARG plrust_release
-ARG plrust_language_version=1.70.0
-ADD "https://github.com/tcdi/plrust/releases/download/v${plrust_release}/plrust-trusted-${plrust_release}_${plrust_language_version}-debian-pg${postgresql_major}-${TARGETARCH}.deb" \
-    /tmp/plrust.deb
-
 ####################
 # internal/supautils.yml
 ####################

ansible/tasks/postgres-extensions/30-plrust.yml

@@ -19,71 +19,39 @@
 	state: present
 	update_cache: yes
 
-- name: plrust - install Rust
+- name: plrust - install plrust
+  ansible.builtin.apt:
+    deb: "https://github.com/tcdi/plrust/releases/download/v{{ plrust_release }/plrust-trusted-{ plrust_release }_{{ plrust_language_version }}-debian-pg{{ postgresql_major }}-{ platform }}.deb"
+
+- name: plrust - install rust
+  become: yes
+	become_user: postgres
+	become_method: su
   shell: |
 	wget -qO- https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain={{ plrust_language_version }}
 	echo 'source "$HOME/.cargo/env"' >> $HOME/.bashrc
   args:
 	creates: "$HOME/.cargo"
 
-- name: plrust - install Rust toolchain and set default
+- name: plrust - install rust toolchain and set default
+	become: yes
+	become_user: postgres
+	become_method: su
   shell: |
 	source $HOME/.cargo/env
 	rustup toolchain install {{ plrust_language_version }}
 	rustup default {{ plrust_language_version }}
   args:
 	executable: /bin/bash
 
-- name: plrust - add components and target
+- name: plrust - add rust components and target
+	become: yes
+	become_user: postgres
+	become_method: su
   shell: |
 	source $HOME/.cargo/env
 	rustup component add llvm-tools-preview rustc-dev
 	rustup target install x86_64-unknown-linux-gnu
-  args:
-	executable: /bin/bash
-
-- name: plrust - install cargo-pgrx and initialize
-  shell: |
-	source $HOME/.cargo/env
-	cargo install cargo-pgrx --locked
-	cargo pgrx init --pg{{ postgresql_major }} /usr/bin/pg_config
-  args:
-	executable: /bin/bash
-
-- name: plrust - clone plrust
-  git:
-    repo: https://github.com/tcdi/plrust
-    dest: /tmp/plrust
-    version: v{{ plrust_release }}
-
-
-- name: plrust - move plrustc binary to .cargo/bin
-  command:
-	cmd: mv "/tmp/plrust/plrust/build/bin/plrustc" "$HOME/.cargo/bin/"
-	warn: false
-
-- name: plrust - build plrust
-  shell: |
-	source $HOME/.cargo/env
-	export PG_VER="{{ postgresql_major }}"
-
-	if [[ "{{ platform }}" == "arm64" ]]; then
-		STD_TARGETS="aarch64-postgres-linux-gnu"
-	elif [[ "{{ platform }}" == "amd64" ]]; then
-		STD_TARGETS="amd64-postgres-linux-gnu"
-	else
-		echo "Unsupported platform: $platform"
-		exit 1
-	fi
-
-	./build
-  args:
-	executable: /bin/bash
-	chdir: "/tmp/plrust/plrust"
-
-- name: plrust - install plrust
-  shell: |
-	source $HOME/.cargo/env
-	cargo pgrx install --release --features trusted -c /usr/bin/pg_config
+	rustup target install aarch64-unknown-linux-gnu
   args:
 	executable: /bin/bash

ansible/tasks/setup-docker.yml

@@ -3,6 +3,9 @@
     src: files/extensions/
     dest: /tmp/extensions/
 
+- name: plrust - install
+  import_tasks: tasks/postgres-extensions/30-plrust.yml
+
 # Builtin apt module does not support wildcard for deb paths
 - name: Install extensions
   shell: |

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.0.107-plrust"
+postgres-version = "15.1.0.107-plrust-1"