chore: ubuntu 18 postgres .deb install compat

Author: pcnc

.github/workflows/ami-build-ubuntu-18.yml

@@ -24,7 +24,8 @@ jobs:
         include:
         - runner: arm-runner
           arch: arm64
-          ubuntu: focal
+          ubuntu_release: bionic
+          ubuntu_version: 18.04
           mcpu: neoverse-n1
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 150
@@ -74,18 +75,19 @@ jobs:
           file: docker/Dockerfile
           target: pg-deb
           build-args: |
-            ubuntu_release=${{ matrix.ubuntu }}
+            ubuntu_release=${{ matrix.ubuntu_release }}
+            ubuntu_version=${{ matrix.ubuntu_version }}
             postgresql_major=${{ steps.version.outputs.postgresql_major }}
             postgresql_release=${{ steps.version.outputs.postgresql_release }}
             CPPFLAGS=-mcpu=${{ matrix.mcpu }}
-          tags: supabase/postgres:deb
+          tags: supabase/postgres:deb-u18
           platforms: linux/${{ matrix.arch }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
       - name: Extract Postgres deb
         run: |
           mkdir -p /tmp/build ansible/files/postgres
-          docker save supabase/postgres:deb | tar xv -C /tmp/build
+          docker save supabase/postgres:deb-u18 | tar xv -C /tmp/build
           for layer in /tmp/build/*/layer.tar; do
             tar xvf "$layer" -C ansible/files/postgres --strip-components 1
           done

.github/workflows/ami-release.yml

@@ -16,7 +16,8 @@ jobs:
         include:
           - runner: arm-runner
             arch: arm64
-            ubuntu: focal
+            ubuntu_release: focal
+            ubuntu_version: 20.04
             mcpu: neoverse-n1
     runs-on: ${{ matrix.runner }}
     timeout-minutes: 150
@@ -66,7 +67,8 @@ jobs:
           file: docker/Dockerfile
           target: pg-deb
           build-args: |
-            ubuntu_release=${{ matrix.ubuntu }}
+            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 }}
             CPPFLAGS=-mcpu=${{ matrix.mcpu }}
@@ -136,15 +138,15 @@ jobs:
           tag_name: ${{ steps.process_release_version.outputs.version }}
           target_commitish: ${{github.sha}}
 
-      - name: Slack Notification on Failure
-        if: ${{ failure() }}
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK }}
-          SLACK_USERNAME: 'gha-failures-notifier'
-          SLACK_COLOR: 'danger'
-          SLACK_MESSAGE: 'Building Postgres AMI failed'
-          SLACK_FOOTER: ''
+      # - name: Slack Notification on Failure
+      #   if: ${{ failure() }}
+      #   uses: rtCamp/action-slack-notify@v2
+      #   env:
+      #     SLACK_WEBHOOK: ${{ secrets.SLACK_NOTIFICATIONS_WEBHOOK }}
+      #     SLACK_USERNAME: 'gha-failures-notifier'
+      #     SLACK_COLOR: 'danger'
+      #     SLACK_MESSAGE: 'Building Postgres AMI failed'
+      #     SLACK_FOOTER: ''
 
       - name: Cleanup resources on build cancellation
         if: ${{ cancelled() }}

ansible/tasks/internal/collect-pg-binaries.yml

@@ -6,7 +6,7 @@
 - name: Collect Postgres binaries - collect binaries and libraries
   copy:
     remote_src: yes
-    src: /usr/lib/postgresql/{{ item }}/
+    src: /usr/lib/postgresql/{{ postgresql_major }}/{{ item }}/
     dest: /tmp/pg_binaries/{{ postgresql_major }}/{{ item }}/
   with_items:
     - bin

ansible/tasks/internal/supautils.yml

@@ -15,7 +15,7 @@
       - clang-12
     update_cache: yes
     cache_valid_time: 3600
-  when: ansible_distribution_version != "18.04"
+  when: ansible_distribution_version == "18.04"
 
 - name: supautils - download latest release
   get_url:

ansible/tasks/setup-postgres.yml

@@ -8,6 +8,11 @@
     repo: "deb [ trusted=yes ] file:///tmp/build ./"
     state: present
 
+- name: Postgres install deps - Ubuntu 18.04 compat
+  ansible.builtin.apt:
+    deb: "http://ftp.debian.org/debian/pool/main/i/init-system-helpers/init-system-helpers_1.60_all.deb"
+  when: ansible_distribution_version == "18.04"
+
 - name: Postgres - install commons
   apt:
     name: postgresql-common

common.vars.pkr.hcl

@@ -1 +1 @@
-postgres-version = "15.1.0.98-rc0"
+postgres-version = "15.1.0.98-rc1"

docker/Dockerfile

@@ -2,6 +2,7 @@ ARG ubuntu_release=focal
 FROM ubuntu:${ubuntu_release} as base
 
 ARG ubuntu_release
+ARG ubuntu_release_no
 ARG postgresql_major=15
 ARG postgresql_release=${postgresql_major}.1
 
@@ -39,8 +40,8 @@ RUN apt-get build-dep -y postgresql-common pgdg-keyring && \
     dpkg-scanpackages . > Packages && \
     apt-get -o Acquire::GzipIndexes=false update
 
-RUN apt-get build-dep -y "postgresql-${postgresql_major}=${postgresql_release}-1.pgdg20.04+1" && \
-    apt-get source --compile "postgresql-${postgresql_major}=${postgresql_release}-1.pgdg20.04+1" && \
+RUN apt-get build-dep -y "postgresql-${postgresql_major}=${postgresql_release}-1.pgdg${ubuntu_release_no}+1" && \
+    apt-get source --compile "postgresql-${postgresql_major}=${postgresql_release}-1.pgdg${ubuntu_release_no}+1" && \
     dpkg-scanpackages . > Packages && \
     apt-get -o Acquire::GzipIndexes=false update
 
@@ -60,7 +61,7 @@ RUN echo "deb [ trusted=yes ] file:///tmp/build ./" > /etc/apt/sources.list.d/te
     apt-get -o Acquire::GzipIndexes=false update && \
     apt-get install -y --no-install-recommends postgresql-common && \
     sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf && \
-    apt-get install -y --no-install-recommends "postgresql-${postgresql_major}=${postgresql_release}-1.pgdg20.04+1" && \
+    apt-get install -y --no-install-recommends "postgresql-${postgresql_major}=${postgresql_release}-1.pgdg${ubuntu_release_no}+1" && \
     rm -rf /var/lib/apt/lists/* && \
     rm -rf /tmp/build /etc/apt/sources.list.d/temp.list