chore: ubuntu 18 binaries

Author: pcnc

.github/workflows/ami-build-ubuntu-18.yml renamed to .github/workflows/collect-u18-binaries.yml

@@ -1,9 +1,10 @@
-name: Build Ubuntu 18 AMI
+name: Collect Ubuntu 18 compatible binaries
 
 on:
   push:
     branches:
       - develop
+      - pcnc/pg-upgrade-fixes
     paths:
       - '.github/workflows/ami-build-ubuntu-18.yml'
       - 'common.vars.pkr.hcl'
@@ -93,21 +94,29 @@ jobs:
           for layer in /tmp/build/*/layer.tar; do
             tar xvf "$layer" -C ansible/files/postgres --strip-components 1
           done
-      - name: Build AMI
-        run: |
-          GIT_SHA=${{github.sha}}
-          packer build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=u18-${GITHUB_RUN_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common.vars.pkr.hcl" -var-file="legacy.vars.pkr.hcl" amazon-arm64.pkr.hcl
+        
+      - name: Build surrogate Docker image
+        uses: docker/build-push-action@v3
+        with:
+          push: false
+          load: true
+          file: docker/Dockerfile-u18
+          target: pg_binary_collection
+          build-args: |
+            ubuntu_release=${{ matrix.ubuntu_release }}
+            ubuntu_release_no=${{ matrix.ubuntu_version }}
+            postgresql_major=${{ steps.version.outputs.postgresql_major }}
+            postgresql_release=${{ steps.version.outputs.postgresql_release }}
+          tags: supabase/postgres:u18-binaries
+          platforms: linux/${{ matrix.arch }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max,ignore-error=true
 
-      - name: Grab release version
-        id: process_release_version
-        run: |
-          VERSION=$(sed -e 's/postgres-version = "\(.*\)"/\1/g' common.vars.pkr.hcl)
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-          
-      - name: List files
-        id: list_files
+      - name: Copy binary tarball
         run: |
-          ls -la /tmp/
+          CONTAINER_ID=$(docker create supabase/postgres:u18-binaries)
+          docker cp "${CONTAINER_ID}:/tmp/pg_binaries/${{ matrix.ubuntu_version }}.tar.gz" > /tmp/pg_binaries.tar.gz
+          docker rm "${CONTAINER_ID}"
 
       - name: configure aws credentials - staging
         uses: aws-actions/configure-aws-credentials@v1

Dockerfile-u18

@@ -873,19 +873,6 @@ ARG supautils_release
 ADD "https://github.com/supabase/supautils/releases/download/v${supautils_release}/supautils-v${supautils_release}-pg${postgresql_major}-${TARGETARCH}-linux-gnu.deb" \
     /tmp/supautils.deb
 
-####################
-# setup-wal-g.yml
-####################
-FROM base as walg
-ARG wal_g_release
-# ADD "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-18.04-${TARGETARCH}.tar.gz" /tmp/wal-g.tar.gz
-RUN arch=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "$TARGETARCH") && \
-    apt-get update && apt-get install -y --no-install-recommends curl && \
-    curl -kL "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-18.04-${arch}.tar.gz" -o /tmp/wal-g.tar.gz && \
-    tar -xvf /tmp/wal-g.tar.gz -C /tmp && \
-    rm -rf /tmp/wal-g.tar.gz && \
-    mv /tmp/wal-g-pg-ubuntu*18.04-$arch /tmp/wal-g
-
 ####################
 # Collect extension packages
 ####################
@@ -949,7 +936,6 @@ FROM base as production
 
 # Setup extensions
 COPY --from=extensions /tmp /tmp
-COPY --from=walg /tmp/wal-g /usr/local/bin/
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -1016,3 +1002,33 @@ RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccac
     cp -r /ccache/* /tmp
 FROM scratch as buildcache
 COPY --from=stats /tmp /
+
+FROM ubuntu:bionic as pg_binary_collection_base
+ENV DEBIAN_FRONTEND=noninteractive
+
+COPY ansible/files/extensions/* /tmp/build/extensions/
+COPY ansible/files/postgres/* /tmp/build/
+
+RUN echo "deb [ trusted=yes ] file:///tmp/build ./" > /etc/apt/sources.list.d/temp.list
+RUN apt-get update && \
+    apt-get install -y postgresql-${postgresql_major}=${postgresql_release}-1.pgdg18.04+1 --no-install-recommends && \
+    apt-get install -y ca-certificates \
+                        libcurl3-gnutls libmecab2 libnghttp2-14 \
+                        libpsl5 librtmp1 libsodium23 mecab-naist-jdic \
+                        mecab-naist-jdic-eucjp mecab-utils publicsuffix
+RUN rm -f /tmp/build/extensions/postgis* && \
+    dpkg -i /tmp/build/extensions/*
+
+FROM ubuntu:bionic as pg_binary_collection
+
+RUN mkdir -p /tmp/pg_binaries/${postgresql_major}
+COPY --from=pg_binary_collection_base /usr/lib/postgresql/${postgresql_major} /tmp/pg_binaries/${postgresql_major}
+COPY --from=pg_binary_collection_base /usr/lib/postgresql/lib /tmp/pg_binaries/${postgresql_major}/lib
+COPY --from=pg_binary_collection_base /var/lib/postgresql/extension /tmp/pg_binaries/${postgresql_major}/lib
+COPY --from=pg_binary_collection_base /usr/lib/aarch64-linux-gnu/libpq.so.5 /tmp/pg_binaries/${postgresql_major}/lib
+COPY --from=pg_binary_collection_base /usr/lib/aarch64-linux-gnu/libpq.so.5 /tmp/pg_binaries/${postgresql_major}/libpq.so.5
+COPY --from=pg_binary_collection_base /usr/share/postgresql/${postgresql_major} /tmp/pg_binaries/${postgresql_major}/share
+
+RUN cd /tmp/pg_binaries && \
+    tar czvf 18.04.tar.gz ${postgresql_major}/ && \
+    rm -rf ${postgresql_major}/