Skip to content

Commit 63d7e6f

Browse files
def-def-
committed
docker: Upgrade Ubuntu images to 26.04 LTS
1 parent 00cc513 commit 63d7e6f

9 files changed

Lines changed: 43 additions & 43 deletions

File tree

‎ci/builder/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Stage 1: Build a minimum CI Builder image that we can use for the initial
1111
# steps like `mkpipeline` and `Build`, as well as any tests that are self
1212
# contained and use other Docker images.
13-
FROM ubuntu:noble-20260210.1 AS ci-builder-min
13+
FROM ubuntu:resolute-20260404 AS ci-builder-min
1414

1515
WORKDIR /workdir
1616

@@ -46,7 +46,7 @@ RUN apt-get update --fix-missing && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-ge
4646
gnupg2 \
4747
pigz \
4848
python3 \
49-
python3.12-venv \
49+
python3.13-venv \
5050
zstd \
5151
&& apt-get clean \
5252
&& rm -rf /var/lib/apt/lists/* \
@@ -140,12 +140,12 @@ RUN apt-get update --fix-missing && TZ=UTC DEBIAN_FRONTEND=noninteractive apt-ge
140140
gnupg2 \
141141
jq \
142142
lcov \
143-
libc6-dbg \
143+
libc-dbg \
144144
libclang-common-18-dev \
145145
libclang-dev \
146146
libclang-rt-18-dev \
147147
libpq-dev \
148-
libxml2 \
148+
libxml2-16 \
149149
lld \
150150
llvm \
151151
make \

‎misc/images/materialized-base/Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ RUN groupadd --system --gid=999 materialize \
2323
curl \
2424
gettext-base \
2525
nginx \
26-
postgresql-16 \
26+
postgresql-18 \
2727
openssh-client \
2828
tini \
2929
&& if [ "$CI_SANITIZER" != "none" ]; then \
@@ -33,22 +33,22 @@ RUN groupadd --system --gid=999 materialize \
3333
&& apt-get clean \
3434
&& rm -rf /var/lib/postgresql \
3535
# Remove unused PostgreSQL binaries (keep only postgres, initdb, pg_isready, pg_ctl, psql) \
36-
&& find /usr/lib/postgresql/16/bin -type f \
36+
&& find /usr/lib/postgresql/18/bin -type f \
3737
! -name postgres ! -name initdb ! -name pg_isready ! -name pg_ctl ! -name psql \
3838
-delete \
3939
# Remove PostgreSQL client binaries except psql \
4040
&& find /usr/bin -name 'pg_*' -delete \
4141
# Remove docs, man pages \
42-
&& rm -rf /usr/share/postgresql/16/man \
42+
&& rm -rf /usr/share/postgresql/18/man \
4343
&& rm -rf /usr/share/doc/postgresql* \
4444
# Remove LLVM bitcode (PostgreSQL JIT support, not used) \
45-
&& rm -rf /usr/lib/postgresql/16/lib/bitcode \
45+
&& rm -rf /usr/lib/postgresql/18/lib/bitcode \
4646
# Remove pgxs (extension build infrastructure) \
47-
&& rm -rf /usr/lib/postgresql/16/lib/pgxs \
47+
&& rm -rf /usr/lib/postgresql/18/lib/pgxs \
4848
# Remove static libraries \
4949
&& find /usr/lib/postgresql -name '*.a' -delete \
5050
# Remove unused extension SQL files (keep only plpgsql which is needed for initdb) \
51-
&& find /usr/share/postgresql/16/extension -type f \
51+
&& find /usr/share/postgresql/18/extension -type f \
5252
! -name 'plpgsql*' -delete \
5353
# Remove nginx docs and unnecessary files \
5454
&& rm -rf /usr/share/doc/nginx* \

‎misc/images/materialized-base/postgresql.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
data_directory = '/mzdata/postgres'
1111
hba_file = '/etc/postgresql/pg_hba.conf'
1212
ident_file = '/mzdata/postgres/pg_ident.conf'
13-
external_pid_file = '/var/run/postgresql/16-main.pid'
13+
external_pid_file = '/var/run/postgresql/18-main.pid'
1414
listen_addresses = '*'
1515
port = 26257
1616
max_connections = 5000
@@ -22,7 +22,7 @@ max_wal_size = 1GB
2222
min_wal_size = 80MB
2323
log_line_prefix = '%m [%p] %q%u@%d '
2424
log_timezone = UTC
25-
cluster_name = '16/main'
25+
cluster_name = '18/main'
2626
datestyle = 'iso, mdy'
2727
timezone = UTC
2828
lc_messages = 'C.UTF-8'

‎misc/images/ubuntu-base/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# the Business Source License, use of this software will be governed
88
# by the Apache License, Version 2.0.
99

10-
FROM ubuntu:noble-20260210.1
10+
FROM ubuntu:resolute-20260404
1111

1212
# Ensure any Rust binaries that crash print a backtrace.
1313
ENV RUST_BACKTRACE=1

‎misc/python/materialize/checks/all_checks/owners.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -184,20 +184,20 @@ def validate(self) -> Testdrive:
184184
+ self._create_objects("owner_role_03", 11)
185185
+ dedent("""
186186
$ psql-execute command="\\l owner_db*"
187-
\\ List of databases
188-
Name | Owner | Encoding | Locale Provider | Collate | Ctype | ICU Locale | ICU Rules | Access privileges
189-
------------+---------------+----------+-----------------+---------+-------+------------+-----------+-------------------
190-
owner_db1 | owner_role_01 | UTF8 | libc | C | C | | |
191-
owner_db10 | owner_role_02 | UTF8 | libc | C | C | | |
192-
owner_db11 | owner_role_03 | UTF8 | libc | C | C | | |
193-
owner_db2 | other_owner | UTF8 | libc | C | C | | |
194-
owner_db3 | owner_role_01 | UTF8 | libc | C | C | | |
195-
owner_db4 | other_owner | UTF8 | libc | C | C | | |
196-
owner_db5 | owner_role_01 | UTF8 | libc | C | C | | |
197-
owner_db6 | other_owner | UTF8 | libc | C | C | | |
198-
owner_db7 | owner_role_02 | UTF8 | libc | C | C | | |
199-
owner_db8 | other_owner | UTF8 | libc | C | C | | |
200-
owner_db9 | owner_role_01 | UTF8 | libc | C | C | | |
187+
\\ List of databases
188+
Name | Owner | Encoding | Locale Provider | Collate | Ctype | Locale | ICU Rules | Access privileges
189+
------------+---------------+----------+-----------------+---------+-------+--------+-----------+-------------------
190+
owner_db1 | owner_role_01 | UTF8 | libc | C | C | | |
191+
owner_db10 | owner_role_02 | UTF8 | libc | C | C | | |
192+
owner_db11 | owner_role_03 | UTF8 | libc | C | C | | |
193+
owner_db2 | other_owner | UTF8 | libc | C | C | | |
194+
owner_db3 | owner_role_01 | UTF8 | libc | C | C | | |
195+
owner_db4 | other_owner | UTF8 | libc | C | C | | |
196+
owner_db5 | owner_role_01 | UTF8 | libc | C | C | | |
197+
owner_db6 | other_owner | UTF8 | libc | C | C | | |
198+
owner_db7 | owner_role_02 | UTF8 | libc | C | C | | |
199+
owner_db8 | other_owner | UTF8 | libc | C | C | | |
200+
owner_db9 | owner_role_01 | UTF8 | libc | C | C | | |
201201
202202
203203
$ psql-execute command="\\dn owner_schema*"
@@ -217,7 +217,7 @@ def validate(self) -> Testdrive:
217217
owner_schema9 | owner_role_01
218218
219219
$ psql-execute command="\\dt owner_t*"
220-
\\ List of relations
220+
\\ List of tables
221221
Schema | Name | Type | Owner
222222
--------+-----------+-------+---------------
223223
public | owner_t1 | table | owner_role_01
@@ -233,7 +233,7 @@ def validate(self) -> Testdrive:
233233
public | owner_t9 | table | owner_role_01
234234
235235
$ psql-execute command="\\di owner_i*"
236-
\\ List of relations
236+
\\ List of indexes
237237
Schema | Name | Type | Owner | Table
238238
--------+-----------+-------+---------------+-----------
239239
public | owner_i1 | index | owner_role_01 | owner_t1
@@ -249,7 +249,7 @@ def validate(self) -> Testdrive:
249249
public | owner_i9 | index | owner_role_01 | owner_t9
250250
251251
$ psql-execute command="\\dv owner_v*"
252-
\\ List of relations
252+
\\ List of views
253253
Schema | Name | Type | Owner
254254
--------+-----------+------+---------------
255255
public | owner_v1 | view | owner_role_01

‎src/materialized/ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ COPY listener_configs/ /listener_configs/
1313

1414
USER materialize
1515

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

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

‎src/materialized/ci/entrypoint.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,20 @@ if ! is_truthy "${MZ_NO_BUILTIN_POSTGRES:-0}"; then
6363
# Should exist already, but /mzdata might be overwritten with a fresh volume
6464
if [ ! -f $PGDATA/PG_VERSION ]; then
6565
mkdir -p $PGDATA
66-
/usr/lib/postgresql/16/bin/initdb -D $PGDATA -U $PGUSER --auth-local=trust
66+
/usr/lib/postgresql/18/bin/initdb -D $PGDATA -U $PGUSER --auth-local=trust
6767
fi
6868

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

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

79-
until /usr/lib/postgresql/16/bin/pg_isready > /dev/null 2>&1; do
79+
until /usr/lib/postgresql/18/bin/pg_isready > /dev/null 2>&1; do
8080
sleep 0.01
8181
done
8282

‎test/chbench/chbench/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN ls build
5252

5353
MZFROM ubuntu-base
5454

55-
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/*
55+
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/*
5656

5757
COPY odbc.ini /etc/odbc.ini
5858
COPY mz-default-postgres.cfg /etc/chbenchmark/mz-default-postgres.cfg

‎test/testdrive/catalog.td‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ materialize ""
147147

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

156156

157157

@@ -829,19 +829,19 @@ test_table ""
829829
> CREATE TABLE tester2.test_table (a int)
830830

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

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

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

0 commit comments

Comments
 (0)