Skip to content

Commit 819f21b

Browse files
committed
feat: switch base container to Ubuntu 26.04
1 parent a531283 commit 819f21b

2 files changed

Lines changed: 17 additions & 13 deletions

File tree

.devcontainer/base/Dockerfile

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ubuntu:24.04@sha256:cd1dba651b3080c3686ecf4e3c4220f026b521fb76978881737d24f200828b2b AS extractor
3+
FROM ubuntu:26.04@sha256:a072b64036a738e55bff8f9a9682cbb893bf20c213772effc1de8dee8df1cea9 AS extractor
44

55
ARG BATS_CORE_VERSION=1.13.0
66
ARG BATS_SUPPORT_VERSION=0.3.0
@@ -20,10 +20,12 @@ RUN tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
2020
&& tar xzf /bats-support.tar.gz && mv bats-support-*/ bats-support \
2121
&& tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert
2222

23-
FROM ubuntu:24.04@sha256:cd1dba651b3080c3686ecf4e3c4220f026b521fb76978881737d24f200828b2b
23+
FROM ubuntu:26.04@sha256:a072b64036a738e55bff8f9a9682cbb893bf20c213772effc1de8dee8df1cea9
2424

2525
ARG DEBIAN_FRONTEND=noninteractive
2626

27+
ENV LANG=en_US.UTF-8
28+
2729
HEALTHCHECK NONE
2830

2931
SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
@@ -49,8 +51,10 @@ RUN --mount=type=bind,source=.devcontainer/base/apt-requirements.json,target=/tm
4951
cp -r /src/bats-support /usr/local/bats-support
5052
cp -r /src/bats-assert /usr/local/bats-assert
5153

52-
# Update all tool alternatives to the correct version
53-
# and patch root's bashrc to include bash-completion
54-
update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 20
54+
# Generate locale
55+
sed -i '/en_US.UTF-8/s/^# //' /etc/locale.gen
56+
locale-gen
57+
58+
# Patch root's bashrc to include bash-completion
5559
cp /etc/skel/.bashrc /root/.bashrc
5660
EOF
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"bash-completion": "1:2.11-8",
3-
"ca-certificates": "20240203",
4-
"g++-14": "14.2.0-4ubuntu2~24.04.1",
5-
"git": "1:2.43.0-1ubuntu7.3",
6-
"gnupg2": "2.4.4-2ubuntu17.4",
7-
"udev": "255.4-1ubuntu8.14",
8-
"wget": "1.21.4-1ubuntu4.1",
9-
"xz-utils": "5.6.1+really5.4.5-1ubuntu0.2"
2+
"bash-completion": "1:2.16.0-8build1",
3+
"ca-certificates": "20250419build1",
4+
"git": "1:2.53.0-1ubuntu1",
5+
"gnupg2": "2.4.8-4ubuntu3",
6+
"locales": "2.43-2ubuntu1",
7+
"udev": "259.5-0ubuntu1",
8+
"wget": "1.25.0-2ubuntu4",
9+
"xz-utils": "5.8.2-2"
1010
}

0 commit comments

Comments
 (0)