2020# Basic deps
2121ARG CONTAINERD_VERSION=v2.0.1
2222ARG RUNC_VERSION=v1.2.3
23- ARG CNI_PLUGINS_VERSION=v1.6.1
23+ ARG CNI_PLUGINS_VERSION=v1.6.2
2424
2525# Extra deps: Build
2626ARG BUILDKIT_VERSION=v0.18.2
@@ -57,18 +57,18 @@ FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debia
5757COPY --from=xx / /
5858ENV DEBIAN_FRONTEND=noninteractive
5959RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
60- git \
61- dpkg-dev
60+ git \
61+ dpkg-dev
6262ARG TARGETARCH
6363# libbtrfs: for containerd
6464# libseccomp: for runc and bypass4netns
6565RUN 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
7272RUN git config --global advice.detachedHead false
7373
7474FROM build-base-debian AS build-containerd
@@ -246,12 +246,12 @@ COPY --from=build-full /out /
246246FROM ubuntu:${UBUNTU_VERSION} AS base
247247# fuse3 is required by stargz snapshotter
248248RUN 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
255255ARG CONTAINERIZED_SYSTEMD_VERSION
256256RUN curl -o /docker-entrypoint.sh -fsSL --proto '=https' --tlsv1.2 https://raw.githubusercontent.com/AkihiroSuda/containerized-systemd/${CONTAINERIZED_SYSTEMD_VERSION}/docker-entrypoint.sh && \
257257 chmod +x /docker-entrypoint.sh
@@ -278,9 +278,9 @@ FROM base AS test-integration
278278ARG DEBIAN_FRONTEND=noninteractive
279279# `expect` package contains `unbuffer(1)`, which is used for emulating TTY for testing
280280RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
281- expect \
282- git \
283- make
281+ expect \
282+ git \
283+ make
284284COPY --from=goversion /GOVERSION /GOVERSION
285285ARG TARGETARCH
286286RUN 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
325325# (`sudo` does not work for this purpose,
326326# OTOH `machinectl shell` can create the session but does not propagate exit code)
327327RUN 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
331331# TODO: update containerized-systemd to enable sshd by default, or allow `systemctl wants <TARGET> ssh` here
332332RUN ssh-keygen -q -t rsa -f /root/.ssh/id_rsa -N '' && \
333333 useradd -m -s /bin/bash rootless && \
0 commit comments