chore: ubuntu 18 postgres .deb install compat

pcnc · pcnc · commit 68c108ca6fa2 · 2023-06-26T18:04:09.000+03:00
diff --git a/.github/workflows/ami-build-ubuntu-18.yml b/.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_release_no=${{ 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
diff --git a/.github/workflows/ami-release.yml b/.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 }}
diff --git a/ansible/files/admin_api_scripts/pg_upgrade_initiate.sh b/ansible/files/admin_api_scripts/pg_upgrade_initiate.sh
@@ -73,8 +73,9 @@ cleanup() {
         mv /var/lib/postgresql.bak /var/lib/postgresql
     fi
 
-    if [ -L /usr/lib/postgresql/lib/aarch64/libpq.so.5 ]; then
-        rm /usr/lib/postgresql/lib/aarch64/libpq.so.5
+    if [ -L "/usr/share/postgresql/${PGVERSION}" ]; then
+        rm "/usr/share/postgresql/${PGVERSION}"
+        mv "/usr/share/postgresql/${PGVERSION}.bak" "/usr/share/postgresql/${PGVERSION}"
     fi
 
     if [ "$IS_DRY_RUN" = false ]; then
@@ -148,7 +149,6 @@ function initiate_upgrade {
     PGDATANEW="$MOUNT_POINT/pgdata"
     PG_UPGRADE_BIN_DIR="/tmp/pg_upgrade_bin/$PGVERSION"
     PGBINNEW="$PG_UPGRADE_BIN_DIR/bin"
-    PGLIBNEW="$PG_UPGRADE_BIN_DIR/lib"
     PGSHARENEW="$PG_UPGRADE_BIN_DIR/share"
 
     # running upgrade using at least 1 cpu core
@@ -168,12 +168,6 @@ function initiate_upgrade {
 
     chown -R postgres:postgres "/tmp/pg_upgrade_bin/$PGVERSION"
 
-    # Make latest libpq available to pg_upgrade
-    mkdir -p /usr/lib/postgresql/lib/aarch64
-    if [ ! -L /usr/lib/postgresql/lib/aarch64/libpq.so.5 ]; then
-        ln -s "$PGLIBNEW/libpq.so.5" /usr/lib/postgresql/lib/aarch64/libpq.so.5
-    fi
-
     # upgrade job outputs a log in the cwd; needs write permissions
     mkdir -p /tmp/pg_upgrade/
     chown -R postgres:postgres /tmp/pg_upgrade/
@@ -243,19 +237,10 @@ EOF
     if [ "$IS_DRY_RUN" = true ]; then
         UPGRADE_COMMAND="$UPGRADE_COMMAND --check"
     else 
-        mv /var/lib/postgresql /var/lib/postgresql.bak
-        ln -s "$PGSHARENEW" /var/lib/postgresql
-
-        if [ ! -L /var/lib/postgresql.bak/data ]; then
-            if [ -L /var/lib/postgresql/data ]; then
-                rm /var/lib/postgresql/data
-            fi
-            ln -s /var/lib/postgresql.bak/data /var/lib/postgresql/data
-        fi
-        
-        if [ ! -L /var/lib/postgresql/data ]; then
-            ln -s /data/pgdata /var/lib/postgresql/data
+        if [ -d "/usr/share/postgresql/${PGVERSION}" ]; then
+            mv "/usr/share/postgresql/${PGVERSION}" "/usr/share/postgresql/${PGVERSION}.bak"
         fi
+        ln -s "$PGSHARENEW" "/usr/share/postgresql/${PGVERSION}"
 
         echo "9. Stopping postgres; running pg_upgrade"
         systemctl stop postgresql
diff --git a/ansible/tasks/internal/collect-pg-binaries.yml b/ansible/tasks/internal/collect-pg-binaries.yml
@@ -6,12 +6,18 @@
 - 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
     - lib
 
+- name: Collect Postgres libraries - collect libraries which are not in /usr/lib/postgresql/lib
+  copy:
+    remote_src: yes
+    src: /usr/lib/postgresql/lib/
+    dest: /tmp/pg_binaries/{{ postgresql_major }}/lib/
+
 - name: Collect Postgres binaries - collect shared files
   copy:
     remote_src: yes
diff --git a/ansible/tasks/internal/supautils.yml b/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:
diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl
@@ -1 +1 @@
-postgres-version = "15.1.0.98-rc0"
+postgres-version = "15.1.0.98-rc3"
diff --git a/docker/Dockerfile b/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
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-postgres-version = "15.1.0.98-rc0"`
	`1`	`+postgres-version = "15.1.0.98-rc3"`