Skip to content

Commit 3d380ac

Browse files
authored
Bump default Debian version to Bookworm everywhere (#9863)
## Problem We have a couple of CI workflows that still run on Debian Bullseye, and the default Debian version in images is Bullseye as well (we explicitly set building on Bookworm) ## Summary of changes - Run `pgbench-pgvector` on Bookworm (fix a couple of packages) - Run `trigger_bench_on_ec2_machine_in_eu_central_1` on Bookworm - Change default `DEBIAN_VERSION` in Dockerfiles to Bookworm - Make `pinned` docker tag an alias to `pinned-bookworm`
1 parent 4630b70 commit 3d380ac

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

.github/workflows/benchmarking.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ jobs:
541541

542542
runs-on: ${{ matrix.RUNNER }}
543543
container:
544-
image: neondatabase/build-tools:pinned
544+
image: neondatabase/build-tools:pinned-bookworm
545545
credentials:
546546
username: ${{ secrets.NEON_DOCKERHUB_USERNAME }}
547547
password: ${{ secrets.NEON_DOCKERHUB_PASSWORD }}
@@ -558,12 +558,12 @@ jobs:
558558
arch=$(uname -m | sed 's/x86_64/amd64/g' | sed 's/aarch64/arm64/g')
559559
560560
cd /home/nonroot
561-
wget -q "https://apt.postgresql.org/pub/repos/apt/pool/main/p/postgresql-17/libpq5_17.2-1.pgdg110+1_${arch}.deb"
562-
wget -q "https://apt.postgresql.org/pub/repos/apt/pool/main/p/postgresql-16/postgresql-client-16_16.6-1.pgdg110+1_${arch}.deb"
563-
wget -q "https://apt.postgresql.org/pub/repos/apt/pool/main/p/postgresql-16/postgresql-16_16.6-1.pgdg110+1_${arch}.deb"
564-
dpkg -x libpq5_17.2-1.pgdg110+1_${arch}.deb pg
565-
dpkg -x postgresql-16_16.6-1.pgdg110+1_${arch}.deb pg
566-
dpkg -x postgresql-client-16_16.6-1.pgdg110+1_${arch}.deb pg
561+
wget -q "https://apt.postgresql.org/pub/repos/apt/pool/main/p/postgresql-17/libpq5_17.2-1.pgdg120+1_${arch}.deb"
562+
wget -q "https://apt.postgresql.org/pub/repos/apt/pool/main/p/postgresql-16/postgresql-client-16_16.6-1.pgdg120+1_${arch}.deb"
563+
wget -q "https://apt.postgresql.org/pub/repos/apt/pool/main/p/postgresql-16/postgresql-16_16.6-1.pgdg120+1_${arch}.deb"
564+
dpkg -x libpq5_17.2-1.pgdg120+1_${arch}.deb pg
565+
dpkg -x postgresql-16_16.6-1.pgdg120+1_${arch}.deb pg
566+
dpkg -x postgresql-client-16_16.6-1.pgdg120+1_${arch}.deb pg
567567
568568
mkdir -p /tmp/neon/pg_install/v16/bin
569569
ln -s /home/nonroot/pg/usr/lib/postgresql/16/bin/pgbench /tmp/neon/pg_install/v16/bin/pgbench

.github/workflows/build-build-tools-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117

118118
- name: Create multi-arch image
119119
env:
120-
DEFAULT_DEBIAN_VERSION: bullseye
120+
DEFAULT_DEBIAN_VERSION: bookworm
121121
IMAGE_TAG: ${{ needs.check-image.outputs.tag }}
122122
run: |
123123
for debian_version in bullseye bookworm; do

.github/workflows/periodic_pagebench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
trigger_bench_on_ec2_machine_in_eu_central_1:
3030
runs-on: [ self-hosted, small ]
3131
container:
32-
image: neondatabase/build-tools:pinned
32+
image: neondatabase/build-tools:pinned-bookworm
3333
credentials:
3434
username: ${{ secrets.NEON_DOCKERHUB_USERNAME }}
3535
password: ${{ secrets.NEON_DOCKERHUB_PASSWORD }}

.github/workflows/pin-build-tools-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
9595
- name: Tag build-tools with `${{ env.TO_TAG }}` in Docker Hub, ECR, and ACR
9696
env:
97-
DEFAULT_DEBIAN_VERSION: bullseye
97+
DEFAULT_DEBIAN_VERSION: bookworm
9898
run: |
9999
for debian_version in bullseye bookworm; do
100100
tags=()

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ARG IMAGE=build-tools
77
ARG TAG=pinned
88
ARG DEFAULT_PG_VERSION=17
99
ARG STABLE_PG_VERSION=16
10-
ARG DEBIAN_VERSION=bullseye
10+
ARG DEBIAN_VERSION=bookworm
1111
ARG DEBIAN_FLAVOR=${DEBIAN_VERSION}-slim
1212

1313
# Build Postgres

build-tools.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DEBIAN_VERSION=bullseye
1+
ARG DEBIAN_VERSION=bookworm
22

33
FROM debian:bookworm-slim AS pgcopydb_builder
44
ARG DEBIAN_VERSION

compute/compute-node.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARG REPOSITORY=neondatabase
33
ARG IMAGE=build-tools
44
ARG TAG=pinned
55
ARG BUILD_TAG
6-
ARG DEBIAN_VERSION=bullseye
6+
ARG DEBIAN_VERSION=bookworm
77
ARG DEBIAN_FLAVOR=${DEBIAN_VERSION}-slim
88

99
#########################################################################################

0 commit comments

Comments
 (0)