Skip to content

Commit

Permalink
Update debian to bookworm
Browse files Browse the repository at this point in the history
  • Loading branch information
hanefi committed Jan 7, 2025
1 parent 811e8e6 commit 4af5f14
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions circleci/images/citusupgradetester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# we cannot easily upgrade to python 3.11 as our mitmproxy fork does not ship with it
FROM python:3.9.7-slim-bullseye AS base
FROM python:3.9.7-slim-bookworm AS base

# add unpriviliged user for tests
RUN useradd -ms /bin/bash circleci
Expand Down Expand Up @@ -59,8 +59,8 @@ set -eux

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update

Expand Down
6 changes: 3 additions & 3 deletions circleci/images/extbuilder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM buildpack-deps:bullseye
FROM buildpack-deps:bookworm

# add unpriviliged user for tests
RUN useradd -ms /bin/bash circleci
Expand Down Expand Up @@ -48,8 +48,8 @@ set -eux

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update

Expand Down
10 changes: 5 additions & 5 deletions circleci/images/exttester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# postgres doesn't ship their isolation tester in the server-dev images
# we use this builder to build the isolation tester from a specific version
FROM buildpack-deps:bullseye AS dev-tools-builder
FROM buildpack-deps:bookworm AS dev-tools-builder

RUN <<'EOF'
# install dependencies
Expand Down Expand Up @@ -65,7 +65,7 @@ WORKDIR /build/postgresql-${PG_VERSION_CLEAN}/build
RUN ../configure --prefix /usr/lib/postgresql/${PG_MAJOR}/
RUN make -sj8

FROM buildpack-deps:bullseye AS dev-tools-collection
FROM buildpack-deps:bookworm AS dev-tools-collection

WORKDIR /collect

Expand All @@ -84,7 +84,7 @@ COPY --from=dev-tools-builder /build/postgresql-${PG_VERSION_CLEAN}/build/src/te
COPY --from=dev-tools-builder /build/postgresql-${PG_VERSION_CLEAN}/src/test/regress/ usr/lib/postgresql/${PG_MAJOR}/lib/regress/
RUN rm -rf usr/lib/postgresql/${PG_MAJOR}/lib/regress/*.c usr/lib/postgresql/${PG_MAJOR}/lib/regress/*.h

FROM buildpack-deps:bullseye
FROM buildpack-deps:bookworm

# add unpriviliged user for tests
RUN useradd -ms /bin/bash circleci
Expand Down Expand Up @@ -154,8 +154,8 @@ set -eux

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update

Expand Down
6 changes: 3 additions & 3 deletions circleci/images/failtester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# we cannot easily upgrade to python 3.11 as our mitmproxy fork does not ship with it
FROM python:3.9.7-slim-bullseye
FROM python:3.9.7-slim-bookworm

# add unpriviliged user for tests
RUN useradd -ms /bin/bash circleci
Expand Down Expand Up @@ -58,8 +58,8 @@ RUN <<'EOF'

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update

Expand Down
6 changes: 3 additions & 3 deletions circleci/images/pgupgradetester/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# we cannot easily upgrade to python 3.11 as our mitmproxy fork does not ship with it
FROM python:3.9.7-slim-bullseye
FROM python:3.9.7-slim-bookworm

# add unpriviliged user for tests
RUN useradd -ms /bin/bash circleci
Expand Down Expand Up @@ -59,8 +59,8 @@ set -eux

# install key and repositories
curl -sf https://www.postgresql.org/media/keys/ACCC4CF8.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add -
echo "deb https://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bullseye-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list
echo "deb https://apt-archive.postgresql.org/pub/repos/apt bookworm-pgdg-archive main" >> /etc/apt/sources.list.d/postgresql.list

apt-get update

Expand Down

0 comments on commit 4af5f14

Please sign in to comment.