From 5a7019af314a473aff2d7bc783ac29daa5f0f079 Mon Sep 17 00:00:00 2001
From: Feike Steenbergen <feike@timescale.com>
Date: Wed, 28 Jun 2023 17:05:03 +0200
Subject: [PATCH] Get started with plrust

---
 Dockerfile | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 98688da1..a2e9a344 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,22 +87,23 @@ RUN set -eux; \
 # forbid creation of a main cluster when package is installed
 RUN sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf
 
-# The next 2 instructions (ENV + RUN) are directly copied from https://github.com/rust-lang/docker-rust/blob/d534735bae832da4c60ddf799a8dfbefa9939020/1.67.0/bullseye/Dockerfile
+# The next 2 instructions (ENV + RUN) are directly copied from https://github.com/rust-lang/docker-rust/blob/master/1.70.0/bullseye/Dockerfile
+# Note: pl/rust requires 1.70.0
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \
-    RUST_VERSION=1.66.1
+    RUST_VERSION=1.70.0
 
 RUN set -eux; \
     dpkgArch="$(dpkg --print-architecture)"; \
     case "${dpkgArch##*-}" in \
-        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='bb31eaf643926b2ee9f4d8d6fc0e2835e03c0a60f34d324048aa194f0b29a71c' ;; \
-        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='6626b90205d7fe7058754c8e993b7efd91dedc6833a11a225b296b7c2941194f' ;; \
-        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='4ccaa7de6b8be1569f6b764acc28e84f5eca342f5162cd5c810891bff7ed7f74' ;; \
-        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='34392b53a25c56435b411d3e575b63aab962034dd1409ba405e708610c829607' ;; \
+        amd64) rustArch='x86_64-unknown-linux-gnu'; rustupSha256='0b2f6c8f85a3d02fde2efc0ced4657869d73fccfce59defb4e8d29233116e6db' ;; \
+        armhf) rustArch='armv7-unknown-linux-gnueabihf'; rustupSha256='f21c44b01678c645d8fbba1e55e4180a01ac5af2d38bcbd14aa665e0d96ed69a' ;; \
+        arm64) rustArch='aarch64-unknown-linux-gnu'; rustupSha256='673e336c81c65e6b16dcdede33f4cc9ed0f08bde1dbe7a935f113605292dc800' ;; \
+        i386) rustArch='i686-unknown-linux-gnu'; rustupSha256='e7b0f47557c1afcd86939b118cbcf7fb95a5d1d917bdd355157b63ca00fc4333' ;; \
         *) echo >&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; \
     esac; \
-    url="https://static.rust-lang.org/rustup/archive/1.25.2/${rustArch}/rustup-init"; \
+    url="https://static.rust-lang.org/rustup/archive/1.26.0/${rustArch}/rustup-init"; \
     wget "$url"; \
     echo "${rustupSha256} *rustup-init" | sha256sum -c -; \
     chmod +x rustup-init; \
@@ -113,6 +114,14 @@ RUN set -eux; \
     cargo --version; \
     rustc --version;
 
+RUN rustup component add rustc-dev
+WORKDIR /build
+RUN curl -LsO https://github.com/tcdi/plrust/releases/download/v1.2.1/plrust-trusted-1.2.1_1.70.0-debian-pg15-amd64.deb
+RUN curl -LsO https://github.com/tcdi/plrust/releases/download/v1.2.1/plrust-trusted-1.2.1_1.70.0-debian-pg14-amd64.deb
+RUN curl -LsO https://github.com/tcdi/plrust/releases/download/v1.2.1/plrust-trusted-1.2.1_1.70.0-debian-pg13-amd64.deb
+RUN apt install -f ./plrust-trusted-*pg15-amd64*.deb
+RUN false
+
 # Setup locales, and make sure we have a en_US.UTF-8 locale available
 RUN set -eux; \
     find /usr/share/i18n/charmaps/ -type f ! -name UTF-8.gz -delete; \