Skip to content

Commit 4b6f063

Browse files
samrosesamrose
committed
feat: wip advance to ubuntu 24.04
1 parent 0281d1c commit 4b6f063

18 files changed

+376
-52
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
include:
4141
- runner: arm-runner
4242
arch: arm64
43-
ubuntu_release: focal
44-
ubuntu_version: 20.04
43+
ubuntu_release: noble
44+
ubuntu_version: 24.04
4545
mcpu: neoverse-n1
4646
runs-on: ${{ matrix.runner }}
4747
timeout-minutes: 150
@@ -122,7 +122,7 @@ jobs:
122122
123123
- name: Upload nix flake revision to s3 staging
124124
run: |
125-
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
125+
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
126126
127127
- name: configure aws credentials - prod
128128
uses: aws-actions/configure-aws-credentials@v4
@@ -141,7 +141,7 @@ jobs:
141141
142142
- name: Upload nix flake revision to s3 prod
143143
run: |
144-
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
144+
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
145145
146146
- name: Create release
147147
uses: softprops/action-gh-release@v2

‎.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
@@ -34,8 +34,8 @@ jobs:
3434
include:
3535
- runner: arm-runner
3636
arch: arm64
37-
ubuntu_release: focal
38-
ubuntu_version: 20.04
37+
ubuntu_release: noble
38+
ubuntu_version: 24.04
3939
mcpu: neoverse-n1
4040
runs-on: ${{ matrix.runner }}
4141
timeout-minutes: 150

‎Dockerfile-15

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ ARG index_advisor_release=0.2.0
3838
ARG supautils_release=2.2.0
3939
ARG wal_g_release=2.0.1
4040

41-
FROM ubuntu:focal as base
41+
FROM ubuntu:noble as base
4242

4343
RUN apt update -y && apt install -y \
4444
curl \

‎Dockerfile-orioledb-17

Lines changed: 1 addition & 1 deletion
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=3.0.5
4141

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

4444
RUN apt update -y && apt install -y \
4545
curl \

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
66
- ✅ Postgres [postgresql-15.8](https://www.postgresql.org/docs/15/index.html)
77
- ✅ Postgres [postgresql-17.4](https://www.postgresql.org/docs/17/index.html)
88
- ✅ Postgres [orioledb-postgresql-17_5](https://github.com/orioledb/orioledb)
9-
- ✅ Ubuntu 20.04 (Focal Fossa).
9+
- ✅ Ubuntu 20.04 (Noble Numbat).
1010
- ✅ [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.
1111
- ✅ [Large Systems Extensions](https://github.com/aws/aws-graviton-getting-started#building-for-graviton-and-graviton2). Enabled for ARM images.
1212
## Extensions

‎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
@@ -9,9 +9,9 @@ postgres_major:
99

1010
# Full version strings for each major version
1111
postgres_release:
12-
postgresorioledb-17: "17.0.1.062-orioledb"
13-
postgres17: "17.4.1.012"
14-
postgres15: "15.8.1.069"
12+
postgresorioledb-17: "17.0.1.58-orioledb-noble-2"
13+
postgres17: "17.4.1.008-noble-2"
14+
postgres15: "15.8.1.065-noble-2"
1515

1616
# Non Postgres Extensions
1717
pgbouncer_release: "1.19.0"
@@ -31,18 +31,18 @@ aws_cli_release: "2.23.11"
3131

3232
salt_minion_version: 3007
3333

34-
golang_version: "1.19.3"
34+
golang_version: "1.22.11"
3535
golang_version_checksum:
36-
arm64: sha256:99de2fe112a52ab748fb175edea64b313a0c8d51d6157dba683a6be163fd5eab
37-
amd64: sha256:74b9640724fd4e6bb0ed2a1bc44ae813a03f1e72a4c76253e2d5c015494430ba
36+
arm64: sha256:0fc88d966d33896384fbde56e9a8d80a305dc17a9f48f1832e061724b1719991
37+
amd64: sha256:9ebfcab26801fa4cf0627c6439db7a4da4d3c6766142a3dd83508240e4f21031
3838

3939
envoy_release: 1.28.0
4040
envoy_release_checksum: sha1:b0a06e9cfb170f1993f369beaa5aa9d7ec679ce5
4141
envoy_hot_restarter_release_checksum: sha1:6d43b89d266fb2427a4b51756b649883b0617eda
4242

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

4747
nginx_release: 1.22.0
4848
nginx_release_checksum: sha1:419efb77b80f165666e2ee406ad8ae9b845aba93

0 commit comments

Comments
 (0)