Skip to content

docker: Upgrade Ubuntu images to 26.04 LTS #36053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
def- wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

docker: Upgrade Ubuntu images to 26.04 LTS #36053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ci/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Stage 1: Build a minimum CI Builder image that we can use for the initial
# steps like `mkpipeline` and `Build`, as well as any tests that are self
# contained and use other Docker images.
FROM ubuntu:noble-20260210.1 AS ci-builder-min
FROM ubuntu:resolute-20260404 AS ci-builder-min

WORKDIR /workdir

Expand Down Expand Up @@ -46,7 +46,7 @@ RUN apt-get update --fix-missing && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-ge
gnupg2 \
pigz \
python3 \
python3.12-venv \
python3-venv \
zstd \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
Expand Down Expand Up @@ -140,12 +140,12 @@ RUN apt-get update --fix-missing && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-ge
gnupg2 \
jq \
lcov \
libc6-dbg \
libc-dbg \
libclang-common-18-dev \
libclang-dev \
libclang-rt-18-dev \
libpq-dev \
libxml2 \
libxml2-16 \
lld \
llvm \
make \
Expand Down
2 changes: 1 addition & 1 deletion ci/builder/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ pandas==2.3.3
pandas-stubs==2.3.3.260113
parameterized==0.9.0
paramiko==4.0.0
pdoc==15.0.4
pdoc==16.0.0
pg8000==1.31.5
prettytable==3.17.0
psutil==7.2.2
Expand Down
12 changes: 6 additions & 6 deletions misc/images/materialized-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN groupadd --system --gid=999 materialize \
curl \
gettext-base \
nginx \
postgresql-16 \
postgresql-18 \
openssh-client \
tini \
&& if [ "$CI_SANITIZER" != "none" ]; then \
Expand All @@ -33,22 +33,22 @@ RUN groupadd --system --gid=999 materialize \
&& apt-get clean \
&& rm -rf /var/lib/postgresql \
# Remove unused PostgreSQL binaries (keep only postgres, initdb, pg_isready, pg_ctl, psql) \
&& find /usr/lib/postgresql/16/bin -type f \
&& find /usr/lib/postgresql/18/bin -type f \
! -name postgres ! -name initdb ! -name pg_isready ! -name pg_ctl ! -name psql \
-delete \
# Remove PostgreSQL client binaries except psql \
&& find /usr/bin -name 'pg_*' -delete \
# Remove docs, man pages \
&& rm -rf /usr/share/postgresql/16/man \
&& rm -rf /usr/share/postgresql/18/man \
&& rm -rf /usr/share/doc/postgresql* \
# Remove LLVM bitcode (PostgreSQL JIT support, not used) \
&& rm -rf /usr/lib/postgresql/16/lib/bitcode \
&& rm -rf /usr/lib/postgresql/18/lib/bitcode \
# Remove pgxs (extension build infrastructure) \
&& rm -rf /usr/lib/postgresql/16/lib/pgxs \
&& rm -rf /usr/lib/postgresql/18/lib/pgxs \
# Remove static libraries \
&& find /usr/lib/postgresql -name '*.a' -delete \
# Remove unused extension SQL files (keep only plpgsql which is needed for initdb) \
&& find /usr/share/postgresql/16/extension -type f \
&& find /usr/share/postgresql/18/extension -type f \
! -name 'plpgsql*' -delete \
# Remove nginx docs and unnecessary files \
&& rm -rf /usr/share/doc/nginx* \
Expand Down
4 changes: 2 additions & 2 deletions misc/images/materialized-base/postgresql.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
data_directory = '/mzdata/postgres'
hba_file = '/etc/postgresql/pg_hba.conf'
ident_file = '/mzdata/postgres/pg_ident.conf'
external_pid_file = '/var/run/postgresql/16-main.pid'
external_pid_file = '/var/run/postgresql/18-main.pid'
listen_addresses = '*'
port = 26257
max_connections = 5000
Expand All @@ -22,7 +22,7 @@ max_wal_size = 1GB
min_wal_size = 80MB
log_line_prefix = '%m [%p] %q%u@%d '
log_timezone = UTC
cluster_name = '16/main'
cluster_name = '18/main'
datestyle = 'iso, mdy'
timezone = UTC
lc_messages = 'C.UTF-8'
Expand Down
2 changes: 1 addition & 1 deletion misc/images/ubuntu-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# the Business Source License, use of this software will be governed
# by the Apache License, Version 2.0.

FROM ubuntu:noble-20260210.1
FROM ubuntu:resolute-20260404

# Ensure any Rust binaries that crash print a backtrace.
ENV RUST_BACKTRACE=1
Expand Down
34 changes: 17 additions & 17 deletions misc/python/materialize/checks/all_checks/owners.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,20 +184,20 @@ def validate(self) -> Testdrive:
+ self._create_objects("owner_role_03", 11)
+ dedent("""
$ psql-execute command="\\l owner_db*"
\\ List of databases
Name | Owner | Encoding | Locale Provider | Collate | Ctype | ICU Locale | ICU Rules | Access privileges
------------+---------------+----------+-----------------+---------+-------+------------+-----------+-------------------
owner_db1 | owner_role_01 | UTF8 | libc | C | C | | |
owner_db10 | owner_role_02 | UTF8 | libc | C | C | | |
owner_db11 | owner_role_03 | UTF8 | libc | C | C | | |
owner_db2 | other_owner | UTF8 | libc | C | C | | |
owner_db3 | owner_role_01 | UTF8 | libc | C | C | | |
owner_db4 | other_owner | UTF8 | libc | C | C | | |
owner_db5 | owner_role_01 | UTF8 | libc | C | C | | |
owner_db6 | other_owner | UTF8 | libc | C | C | | |
owner_db7 | owner_role_02 | UTF8 | libc | C | C | | |
owner_db8 | other_owner | UTF8 | libc | C | C | | |
owner_db9 | owner_role_01 | UTF8 | libc | C | C | | |
\\ List of databases
Name | Owner | Encoding | Locale Provider | Collate | Ctype | Locale | ICU Rules | Access privileges
------------+---------------+----------+-----------------+---------+-------+--------+-----------+-------------------
owner_db1 | owner_role_01 | UTF8 | libc | C | C | | |
owner_db10 | owner_role_02 | UTF8 | libc | C | C | | |
owner_db11 | owner_role_03 | UTF8 | libc | C | C | | |
owner_db2 | other_owner | UTF8 | libc | C | C | | |
owner_db3 | owner_role_01 | UTF8 | libc | C | C | | |
owner_db4 | other_owner | UTF8 | libc | C | C | | |
owner_db5 | owner_role_01 | UTF8 | libc | C | C | | |
owner_db6 | other_owner | UTF8 | libc | C | C | | |
owner_db7 | owner_role_02 | UTF8 | libc | C | C | | |
owner_db8 | other_owner | UTF8 | libc | C | C | | |
owner_db9 | owner_role_01 | UTF8 | libc | C | C | | |


$ psql-execute command="\\dn owner_schema*"
Expand All @@ -217,7 +217,7 @@ def validate(self) -> Testdrive:
owner_schema9 | owner_role_01

$ psql-execute command="\\dt owner_t*"
\\ List of relations
\\ List of tables
Schema | Name | Type | Owner
--------+-----------+-------+---------------
public | owner_t1 | table | owner_role_01
Expand All @@ -233,7 +233,7 @@ def validate(self) -> Testdrive:
public | owner_t9 | table | owner_role_01

$ psql-execute command="\\di owner_i*"
\\ List of relations
\\ List of indexes
Schema | Name | Type | Owner | Table
--------+-----------+-------+---------------+-----------
public | owner_i1 | index | owner_role_01 | owner_t1
Expand All @@ -249,7 +249,7 @@ def validate(self) -> Testdrive:
public | owner_i9 | index | owner_role_01 | owner_t9

$ psql-execute command="\\dv owner_v*"
\\ List of relations
\\ List of views
Schema | Name | Type | Owner
--------+-----------+------+---------------
public | owner_v1 | view | owner_role_01
Expand Down
2 changes: 1 addition & 1 deletion src/materialized/ci/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY listener_configs/ /listener_configs/

USER materialize

RUN /usr/lib/postgresql/16/bin/initdb -D /mzdata/postgres -U root --auth-local=trust
RUN /usr/lib/postgresql/18/bin/initdb -D /mzdata/postgres -U root --auth-local=trust

COPY materialized entrypoint.sh /usr/local/bin/

Expand Down
6 changes: 3 additions & 3 deletions src/materialized/ci/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,20 +63,20 @@ if ! is_truthy "${MZ_NO_BUILTIN_POSTGRES:-0}"; then
# Should exist already, but /mzdata might be overwritten with a fresh volume
if [ ! -f $PGDATA/PG_VERSION ]; then
mkdir -p $PGDATA
/usr/lib/postgresql/16/bin/initdb -D $PGDATA -U $PGUSER --auth-local=trust
/usr/lib/postgresql/18/bin/initdb -D $PGDATA -U $PGUSER --auth-local=trust
fi

# Might have been killed hard
rm -f $PGDATA/postmaster.pid
/usr/lib/postgresql/16/bin/postgres -D $PGDATA \
/usr/lib/postgresql/18/bin/postgres -D $PGDATA \
-c listen_addresses='*' \
-c unix_socket_directories=/var/run/postgresql \
-c config_file=/etc/postgresql/postgresql.conf > /mzdata/postgres/postgres.log 2>&1 &
PGPID=$!

trap 'kill -INT $PGPID; wait $PGPID' SIGTERM SIGINT

until /usr/lib/postgresql/16/bin/pg_isready > /dev/null 2>&1; do
until /usr/lib/postgresql/18/bin/pg_isready > /dev/null 2>&1; do
sleep 0.01
done

Expand Down
2 changes: 1 addition & 1 deletion test/chbench/chbench/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN ls build

MZFROM ubuntu-base

RUN apt-get update && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-get install -y libconfig++9v5 libmysqlclient21 libpqxx-7.8t64 unixodbc && apt-get clean && rm -rf /var/lib/apt/lists/*
RUN apt-get update && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-get install -y libconfig++11 libmysqlclient24 libpqxx-7.10 unixodbc && apt-get clean && rm -rf /var/lib/apt/lists/*

COPY odbc.ini /etc/odbc.ini
COPY mz-default-postgres.cfg /etc/chbenchmark/mz-default-postgres.cfg
Expand Down
16 changes: 8 additions & 8 deletions test/testdrive/catalog.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ materialize ""

# ...and also in `\l`
$ psql-execute command="\l"
\ List of databases
Name | Owner | Encoding | Locale Provider | Collate | Ctype | ICU Locale | ICU Rules | Access privileges
-------------+-------------+----------+-----------------+---------+-------+------------+-----------+-------------------
d | materialize | UTF8 | libc | C | C | | |
materialize | mz_system | UTF8 | libc | C | C | | |
\ List of databases
Name | Owner | Encoding | Locale Provider | Collate | Ctype | Locale | ICU Rules | Access privileges
-------------+-------------+----------+-----------------+---------+-------+--------+-----------+-------------------
d | materialize | UTF8 | libc | C | C | | |
materialize | mz_system | UTF8 | libc | C | C | | |



Expand Down Expand Up @@ -829,19 +829,19 @@ test_table ""
> CREATE TABLE tester2.test_table (a int)

$ psql-execute command="\dt tester.*"
\ List of relations
\ List of tables
Schema | Name | Type | Owner
--------+------------+-------+-------------
tester | test_table | table | materialize

$ psql-execute command="\dt tester.test_table"
\ List of relations
\ List of tables
Schema | Name | Type | Owner
--------+------------+-------+-------------
tester | test_table | table | materialize

$ psql-execute command="\dt *.test_table"
\ List of relations
\ List of tables
Schema | Name | Type | Owner
---------+------------+-------+-------------
tester | test_table | table | materialize
Expand Down
Loading