Skip to content

Commit 34487cb

Browse files
samrosesamrose
committed
feat: wip advance to ubuntu 24.04
1 parent ba21d04 commit 34487cb

18 files changed

+382
-58
lines changed

‎.github/workflows/ami-release-nix.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
include:
3737
- runner: arm-runner
3838
arch: arm64
39-
ubuntu_release: focal
40-
ubuntu_version: 20.04
39+
ubuntu_release: noble
40+
ubuntu_version: 24.04
4141
mcpu: neoverse-n1
4242
runs-on: ${{ matrix.runner }}
4343
timeout-minutes: 150
@@ -121,7 +121,7 @@ jobs:
121121
122122
- name: Upload nix flake revision to s3 staging
123123
run: |
124-
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
124+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
125125
126126
- name: configure aws credentials - prod
127127
uses: aws-actions/configure-aws-credentials@v4
@@ -140,7 +140,7 @@ jobs:
140140
141141
- name: Upload nix flake revision to s3 prod
142142
run: |
143-
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
143+
aws s3 cp /tmp/pg_binaries.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
144144
145145
- name: Create release
146146
uses: softprops/action-gh-release@v1

‎.github/workflows/publish-nix-pgupgrade-bin-flake-version.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666

6767
- name: Upload pg_upgrade scripts to s3 staging
6868
run: |
69-
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
69+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
7070
7171
- name: Slack Notification on Failure
7272
if: ${{ failure() }}
@@ -113,7 +113,7 @@ jobs:
113113

114114
- name: Upload pg_upgrade scripts to s3 prod
115115
run: |
116-
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/20.04.tar.gz
116+
aws s3 cp /tmp/pg_upgrade_bin.tar.gz s3://${{ secrets.PROD_ARTIFACTS_BUCKET }}/upgrades/postgres/supabase-postgres-${{ steps.process_release_version.outputs.version }}/24.04.tar.gz
117117
118118
- name: Slack Notification on Failure
119119
if: ${{ failure() }}

‎.github/workflows/testinfra-nix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
include:
3131
- runner: arm-runner
3232
arch: arm64
33-
ubuntu_release: focal
34-
ubuntu_version: 20.04
33+
ubuntu_release: noble
34+
ubuntu_version: 24.04
3535
mcpu: neoverse-n1
3636
runs-on: ${{ matrix.runner }}
3737
timeout-minutes: 150

‎Dockerfile-15‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ARG index_advisor_release=0.2.0
3939
ARG supautils_release=2.2.0
4040
ARG wal_g_release=2.0.1
4141

42-
FROM ubuntu:focal as base
42+
FROM ubuntu:noble as base
4343

4444
RUN apt update -y && apt install -y \
4545
curl \
@@ -119,13 +119,13 @@ ENV PGDATA=/var/lib/postgresql/data
119119
####################
120120
FROM base as walg
121121
ARG wal_g_release
122-
# ADD "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-20.04-${TARGETARCH}.tar.gz" /tmp/wal-g.tar.gz
122+
# ADD "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-24.04-${TARGETARCH}.tar.gz" /tmp/wal-g.tar.gz
123123
RUN arch=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "$TARGETARCH") && \
124124
apt-get update && apt-get install -y --no-install-recommends curl && \
125-
curl -kL "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-20.04-aarch64.tar.gz" -o /tmp/wal-g.tar.gz && \
125+
curl -kL "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-24.04-aarch64.tar.gz" -o /tmp/wal-g.tar.gz && \
126126
tar -xvf /tmp/wal-g.tar.gz -C /tmp && \
127127
rm -rf /tmp/wal-g.tar.gz && \
128-
mv /tmp/wal-g-pg-ubuntu*20.04-aarch64 /tmp/wal-g
128+
mv /tmp/wal-g-pg-ubuntu*24.04-aarch64 /tmp/wal-g
129129

130130
# ####################
131131
# # Download gosu for easy step-down from root

‎Dockerfile-orioledb-17‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ARG index_advisor_release=0.2.0
3939
ARG supautils_release=2.2.0
4040
ARG wal_g_release=2.0.1
4141

42-
FROM ubuntu:focal as base
42+
FROM ubuntu:noble as base
4343

4444
RUN apt update -y && apt install -y \
4545
curl \
@@ -118,13 +118,13 @@ ENV PGDATA=/var/lib/postgresql/data
118118
####################
119119
FROM base as walg
120120
ARG wal_g_release
121-
# ADD "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-20.04-${TARGETARCH}.tar.gz" /tmp/wal-g.tar.gz
121+
# ADD "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-24.04-${TARGETARCH}.tar.gz" /tmp/wal-g.tar.gz
122122
RUN arch=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "$TARGETARCH") && \
123123
apt-get update && apt-get install -y --no-install-recommends curl && \
124-
curl -kL "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-20.04-aarch64.tar.gz" -o /tmp/wal-g.tar.gz && \
124+
curl -kL "https://github.com/wal-g/wal-g/releases/download/v${wal_g_release}/wal-g-pg-ubuntu-24.04-aarch64.tar.gz" -o /tmp/wal-g.tar.gz && \
125125
tar -xvf /tmp/wal-g.tar.gz -C /tmp && \
126126
rm -rf /tmp/wal-g.tar.gz && \
127-
mv /tmp/wal-g-pg-ubuntu*20.04-aarch64 /tmp/wal-g
127+
mv /tmp/wal-g-pg-ubuntu*24.04-aarch64 /tmp/wal-g
128128

129129
# ####################
130130
# # Download gosu for easy step-down from root

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
44

55
## Primary Features
66
- ✅ Postgres [15](https://www.postgresql.org/about/news/postgresql-15-released-2526/).
7-
- ✅ Ubuntu 20.04 (Focal Fossa).
7+
- ✅ Ubuntu 24.04 (noble Fossa).
88
- ✅ [wal_level](https://www.postgresql.org/docs/current/runtime-config-wal.html) = logical and [max_replication_slots](https://www.postgresql.org/docs/current/runtime-config-replication.html) = 5. Ready for replication.
99
- ✅ [Large Systems Extensions](https://github.com/aws/aws-graviton-getting-started#building-for-graviton-and-graviton2). Enabled for ARM images.
1010

‎amazon-arm64-nix.pkr.hcl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variable "ami" {
22
type = string
3-
default = "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-*"
3+
default = "ubuntu/images/hvm-ssd/ubuntu-noble-24.04-arm64-server-*"
44
}
55

66
variable "profile" {
@@ -115,7 +115,7 @@ source "amazon-ebssurrogate" "source" {
115115
#secret_key = "${var.aws_secret_key}"
116116
force_deregister = var.force-deregister
117117

118-
# Use latest official ubuntu focal ami owned by Canonical.
118+
# Use latest official ubuntu noble ami owned by Canonical.
119119
source_ami_filter {
120120
filters = {
121121
virtualization-type = "hvm"

‎ansible/tasks/setup-postgres.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
- name: Postgres - install server
2525
apt:
26-
name: postgresql-{{ postgresql_major }}={{ postgresql_release }}-1.pgdg20.04+1
26+
name: postgresql-{{ postgresql_major }}={{ postgresql_release }}-1.pgdg24.04+1
2727
install_recommends: no
2828
when: debpkg_mode
2929

‎ansible/tasks/setup-postgrest.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
- name: PostgREST - add Postgres PPA
1010
apt_repository:
11-
repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg {{ postgresql_major }}"
11+
repo: "deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg {{ postgresql_major }}"
1212
state: present
1313

1414
- name: PostgREST - update apt cache
@@ -30,7 +30,7 @@
3030

3131
- name: PostgREST - remove Postgres PPA
3232
apt_repository:
33-
repo: "deb http://apt.postgresql.org/pub/repos/apt/ focal-pgdg {{ postgresql_major }}"
33+
repo: "deb http://apt.postgresql.org/pub/repos/apt/ noble-pgdg {{ postgresql_major }}"
3434
state: absent
3535

3636
- name: postgis - ensure dependencies do not get autoremoved

‎ansible/vars.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ postgres_major:
88

99
# Full version strings for each major version
1010
postgres_release:
11-
postgresorioledb-17: "17.0.1.032-orioledb"
12-
postgres15: "15.8.1.036"
11+
postgresorioledb-17: "17.0.1.032-orioledb-noble-1"
12+
postgres15: "15.8.1.036-noble-1"
1313

1414
# Non Postgres Extensions
1515
pgbouncer_release: "1.19.0"
@@ -29,23 +29,23 @@ aws_cli_release: "2.2.7"
2929

3030
salt_minion_version: 3007
3131

32-
golang_version: "1.19.3"
32+
golang_version: "1.22.11"
3333
golang_version_checksum:
34-
arm64: sha256:99de2fe112a52ab748fb175edea64b313a0c8d51d6157dba683a6be163fd5eab
35-
amd64: sha256:74b9640724fd4e6bb0ed2a1bc44ae813a03f1e72a4c76253e2d5c015494430ba
34+
arm64: sha256:0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991
35+
amd64: sha256:9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031
3636

3737
envoy_release: 1.28.0
3838
envoy_release_checksum: sha1:b0a06e9cfb170f1993f369beaa5aa9d7ec679ce5
3939
envoy_hot_restarter_release_checksum: sha1:6d43b89d266fb2427a4b51756b649883b0617eda
4040

41-
kong_release_target: focal # if it works, it works
42-
kong_deb: kong_2.8.1_arm64.deb
43-
kong_deb_checksum: sha1:2086f6ccf8454fe64435252fea4d29d736d7ec61
41+
kong_release_target: noble
42+
kong_deb: kong_3.9.0_arm64.deb
43+
kong_deb_checksum: sha1:f458c8b183f79cffae4cd84c989cea4a4ecaaaba
4444

4545
nginx_release: 1.22.0
4646
nginx_release_checksum: sha1:419efb77b80f165666e2ee406ad8ae9b845aba93
4747

48-
wal_g_release: "2.0.1"
48+
wal_g_release: "3.0.5"
4949

5050
postgres_exporter_release: "0.15.0"
5151
postgres_exporter_release_checksum:

0 commit comments

Comments
 (0)