From c0a867d86fc76ae43d15b3111701cef046c3cc9a Mon Sep 17 00:00:00 2001
From: MMeent <matthias@neon.tech>
Date: Fri, 26 Aug 2022 19:58:08 +0200
Subject: [PATCH] Include neon extensions in the main neon images (#2341)

Oversight in #2325 - apparently this area wasn't well-covered by tests in the neon repo.

Fixes #2340
---
 Dockerfile      | 7 ++++---
 vendor/postgres | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2dbe71f1ad..aa31e227da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,12 +10,13 @@ ARG TAG=pinned
 FROM $REPOSITORY/$IMAGE:$TAG AS pg-build
 WORKDIR /home/nonroot
 
-COPY vendor/postgres vendor/postgres
-COPY Makefile Makefile
+COPY --chown=nonroot vendor/postgres vendor/postgres
+COPY --chown=nonroot pgxn pgxn
+COPY --chown=nonroot Makefile Makefile
 
 ENV BUILD_TYPE release
 RUN set -e \
-    && mold -run make -j $(nproc) -s postgres \
+    && mold -run make -j $(nproc) -s neon-pg-ext \
     && rm -rf tmp_install/build \
     && tar -C tmp_install -czf /home/nonroot/postgres_install.tar.gz .
 
diff --git a/vendor/postgres b/vendor/postgres
index 8f132d968c..22d9ead36b 160000
--- a/vendor/postgres
+++ b/vendor/postgres
@@ -1 +1 @@
-Subproject commit 8f132d968cd44068fc6f72e4047f7d3d6320f4bb
+Subproject commit 22d9ead36beeab6b6a99c64f9b0b1576927ad91b