From f3b2a2802ddea81677081b7edbd8827d34a53fdb Mon Sep 17 00:00:00 2001
From: "David E. Wheeler" <david.wheeler@tembo.io>
Date: Fri, 13 Dec 2024 16:41:55 -0500
Subject: [PATCH] Update trunk images (#847)

Build Trunk 0.15.6 with Rust 1.83.0 and upgrade PostgreSQL to 15.10. Fix
a couple of omitted variables and combine multiple `RUN`s to reduce
image layer counts.
---
 images/trunk-test-tembo/Dockerfile |  3 +--
 images/trunk-test/Dockerfile       | 39 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/images/trunk-test-tembo/Dockerfile b/images/trunk-test-tembo/Dockerfile
index cb091941..9fc29af3 100644
--- a/images/trunk-test-tembo/Dockerfile
+++ b/images/trunk-test-tembo/Dockerfile
@@ -3,7 +3,7 @@ ARG TAG=latest
 
 FROM rust:1.82-bookworm as builder
 
-ARG TRUNK_VER=0.15.0
+ARG TRUNK_VER=0.15.6
 
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse
 RUN cargo install --version $TRUNK_VER pg-trunk
@@ -86,7 +86,6 @@ RUN wget https://github.com/duckdb/duckdb/releases/download/v0.8.1/libduckdb-lin
     cp libduckdb.so /usr/lib/x86_64-linux-gnu/ && \
     rm -rf libduckdb-linux-amd64.zip libduckdb.so
 
-
 RUN chown -R postgres:postgres $PGDATA && \
     chmod -R 0700 $PGDATA
 ENV PGDATA /var/lib/postgresql/data2
diff --git a/images/trunk-test/Dockerfile b/images/trunk-test/Dockerfile
index bd76bcf6..3fd79d81 100644
--- a/images/trunk-test/Dockerfile
+++ b/images/trunk-test/Dockerfile
@@ -1,5 +1,5 @@
-FROM rust:1.70.0-slim-bookworm as builder
-ARG TRUNK_VER=0.8.3
+FROM rust:1.83.0-slim-bookworm as builder
+ARG TRUNK_VER=0.15.6
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL sparse
 RUN apt update && apt install -y pkg-config libssl-dev
 RUN cargo install --version $TRUNK_VER pg-trunk
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y \
 STOPSIGNAL SIGINT
 
 ENV PGDATA /var/lib/postgresql/data
-ENV PG_VERSION 15.3
+ENV PG_VERSION 15.10
 ENV PG_MAJOR 15
 ENV PATH $PATH:/usr/lib/postgresql/$PG_MAJOR/bin
 
@@ -92,27 +92,26 @@ RUN apt-get update && apt-get install -y \
 RUN ln -s /usr/lib/jvm/java-11-openjdk-amd64/lib/server/libjvm.so /usr/lib/x86_64-linux-gnu/libjvm.so
 
 # Build Postgres from source
-RUN curl https://ftp.postgresql.org/pub/source/v15.3/postgresql-15.3.tar.bz2 -o postgresql-15.3.tar.bz2
-RUN tar xf postgresql-${PG_VERSION}.tar.bz2
-WORKDIR postgresql-${PG_VERSION}
-RUN ./configure --prefix=/usr/lib/postgresql/${PG_MAJOR} --datarootdir=/usr/share
-RUN make
-RUN make install
-RUN cd .. && rm postgresql-${PG_VERSION}.tar.bz2
+RUN curl https://ftp.postgresql.org/pub/source/v15.3/postgresql-${PG_VERSION}.tar.bz2 -o postgresql-${PG_VERSION}.tar.bz2 \
+    && tar xf postgresql-${PG_VERSION}.tar.bz2 \
+    && cd postgresql-${PG_VERSION} \
+    && ./configure --prefix=/usr/lib/postgresql/${PG_MAJOR} --datarootdir=/usr/share \
+    && make \
+    && make install \
+    && cd .. && rm postgresql-${PG_VERSION}.tar.bz2 \
+    # Remove pre-installed pg_config
+    && rm /usr/bin/pg_config
 
 COPY ./postgresql.conf /usr/share/postgresql/${PG_MAJOR}/postgresql.conf.sample
 
-# Remove pre-installed pg_config
-RUN rm /usr/bin/pg_config
-
 # cache extensions and shared libraries
-RUN mkdir /tmp/pg_sharedir && \
-        mkdir /tmp/pg_pkglibdir && \
-        cp -r $(pg_config --sharedir)/* /tmp/pg_sharedir && \
-        cp -r $(pg_config --pkglibdir)/* /tmp/pg_pkglibdir
-RUN mkdir -p /var/run/postgresql && chmod 775 /var/run/postgresql
-RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension && chmod 775 /usr/share/postgresql/${PG_MAJOR}/extension
-RUN chown -R postgres:postgres /usr/lib/postgresql/${PG_MAJOR} /usr/share/postgresql/extension
+RUN mkdir /tmp/pg_sharedir \
+    && mkdir /tmp/pg_pkglibdir \
+    && cp -r $(pg_config --sharedir)/* /tmp/pg_sharedir \
+    &&  cp -r $(pg_config --pkglibdir)/* /tmp/pg_pkglibdir \
+    && mkdir -p /var/run/postgresql && chmod 775 /var/run/postgresql \
+    && mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension && chmod 775 /usr/share/postgresql/${PG_MAJOR}/extension \
+    && chown -R postgres:postgres /usr/lib/postgresql/${PG_MAJOR} /usr/share/postgresql/extension
 COPY docker-entrypoint.sh /usr/local/bin/
 COPY trunk-install.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]