20
20
# Basic deps
21
21
ARG CONTAINERD_VERSION=v2.0.1
22
22
ARG RUNC_VERSION=v1.2.3
23
- ARG CNI_PLUGINS_VERSION=v1.6.1
23
+ ARG CNI_PLUGINS_VERSION=v1.6.2
24
24
25
25
# Extra deps: Build
26
26
ARG BUILDKIT_VERSION=v0.18.2
@@ -57,18 +57,18 @@ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debia
57
57
COPY --from=xx / /
58
58
ENV DEBIAN_FRONTEND=noninteractive
59
59
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
60
- git \
61
- dpkg-dev
60
+ git \
61
+ dpkg-dev
62
62
ARG TARGETARCH
63
63
# libbtrfs: for containerd
64
64
# libseccomp: for runc and bypass4netns
65
65
RUN xx-apt-get update -qq && xx-apt-get install -qq --no-install-recommends \
66
- binutils \
67
- gcc \
68
- libc6-dev \
69
- libbtrfs-dev \
70
- libseccomp-dev \
71
- pkg-config
66
+ binutils \
67
+ gcc \
68
+ libc6-dev \
69
+ libbtrfs-dev \
70
+ libseccomp-dev \
71
+ pkg-config
72
72
RUN git config --global advice.detachedHead false
73
73
74
74
FROM build-base-debian AS build-containerd
@@ -246,12 +246,12 @@ COPY --from=build-full /out /
246
246
FROM ubuntu:${UBUNTU_VERSION} AS base
247
247
# fuse3 is required by stargz snapshotter
248
248
RUN apt-get update -qq && apt-get install -qq -y --no-install-recommends \
249
- apparmor \
250
- bash-completion \
251
- ca-certificates curl \
252
- iproute2 iptables \
253
- dbus dbus-user-session systemd systemd-sysv \
254
- fuse3
249
+ apparmor \
250
+ bash-completion \
251
+ ca-certificates curl \
252
+ iproute2 iptables \
253
+ dbus dbus-user-session systemd systemd-sysv \
254
+ fuse3
255
255
ARG CONTAINERIZED_SYSTEMD_VERSION
256
256
RUN curl -o /docker-entrypoint.sh -fsSL --proto '=https' --tlsv1.2 https://raw.githubusercontent.com/AkihiroSuda/containerized-systemd/${CONTAINERIZED_SYSTEMD_VERSION}/docker-entrypoint.sh && \
257
257
chmod +x /docker-entrypoint.sh
@@ -278,9 +278,9 @@ FROM base AS test-integration
278
278
ARG DEBIAN_FRONTEND=noninteractive
279
279
# `expect` package contains `unbuffer(1)`, which is used for emulating TTY for testing
280
280
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
281
- expect \
282
- git \
283
- make
281
+ expect \
282
+ git \
283
+ make
284
284
COPY --from=goversion /GOVERSION /GOVERSION
285
285
ARG TARGETARCH
286
286
RUN curl -fsSL --proto '=https' --tlsv1.2 https://golang.org/dl/$(cat /GOVERSION).linux-${TARGETARCH:-amd64}.tar.gz | tar xzvC /usr/local
@@ -325,9 +325,9 @@ FROM test-integration AS test-integration-rootless
325
325
# (`sudo` does not work for this purpose,
326
326
# OTOH `machinectl shell` can create the session but does not propagate exit code)
327
327
RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
328
- uidmap \
329
- openssh-server \
330
- openssh-client
328
+ uidmap \
329
+ openssh-server \
330
+ openssh-client
331
331
# TODO: update containerized-systemd to enable sshd by default, or allow `systemctl wants <TARGET> ssh` here
332
332
RUN ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N '' && \
333
333
useradd -m -s /bin/bash rootless && \
0 commit comments