From 8f18fe49ae17283254231de236d96144474567b3 Mon Sep 17 00:00:00 2001 From: Teja Swaroop Pothala Date: Wed, 26 Nov 2025 15:11:07 +0000 Subject: [PATCH] KASM-7979 fix dind images --- dockerfile-kasm-ubuntu-jammy-dind | 1 + dockerfile-kasm-ubuntu-jammy-dind-rootless | 6 +++++- dockerfile-kasm-ubuntu-noble-dind | 1 + dockerfile-kasm-ubuntu-noble-dind-rootless | 6 +++++- src/ubuntu/install/dind/daemon.json | 3 +++ src/ubuntu/install/dind_rootless/daemon.json | 3 +++ 6 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 src/ubuntu/install/dind/daemon.json create mode 100644 src/ubuntu/install/dind_rootless/daemon.json diff --git a/dockerfile-kasm-ubuntu-jammy-dind b/dockerfile-kasm-ubuntu-jammy-dind index e03eca4..14b6fb3 100644 --- a/dockerfile-kasm-ubuntu-jammy-dind +++ b/dockerfile-kasm-ubuntu-jammy-dind @@ -27,6 +27,7 @@ ENV DEBUG=false \ COPY ./src/ubuntu/install/dind/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod 755 $STARTUPDIR/custom_startup.sh COPY ./src/ubuntu/install/dind/dockerd.conf /etc/supervisor/conf.d/ +COPY ./src/ubuntu/install/dind/daemon.json /etc/docker/daemon.json # Copy install scripts COPY ./src/ $INST_DIR diff --git a/dockerfile-kasm-ubuntu-jammy-dind-rootless b/dockerfile-kasm-ubuntu-jammy-dind-rootless index 46b38b4..ee315ea 100644 --- a/dockerfile-kasm-ubuntu-jammy-dind-rootless +++ b/dockerfile-kasm-ubuntu-jammy-dind-rootless @@ -18,7 +18,11 @@ COPY ./src/ubuntu/install/dind_rootless/modprobe /usr/local/bin/modprobe RUN chmod +x /usr/local/bin/modprobe ENV XDG_RUNTIME_DIR=/docker \ DOCKER_HOST=unix:///docker/docker.sock -RUN mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR +RUN mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR && \ + mkdir -p /home/kasm-user/.config/docker && \ + chown -R 1000:0 /home/kasm-user/.config +COPY ./src/ubuntu/install/dind_rootless/daemon.json /home/kasm-user/.config/docker/daemon.json +RUN chown 1000:0 /home/kasm-user/.config/docker/daemon.json ### Envrionment config ENV DEBIAN_FRONTEND=noninteractive \ diff --git a/dockerfile-kasm-ubuntu-noble-dind b/dockerfile-kasm-ubuntu-noble-dind index 5d32051..bbcfc60 100644 --- a/dockerfile-kasm-ubuntu-noble-dind +++ b/dockerfile-kasm-ubuntu-noble-dind @@ -27,6 +27,7 @@ ENV DEBUG=false \ COPY ./src/ubuntu/install/dind/custom_startup.sh $STARTUPDIR/custom_startup.sh RUN chmod 755 $STARTUPDIR/custom_startup.sh COPY ./src/ubuntu/install/dind/dockerd.conf /etc/supervisor/conf.d/ +COPY ./src/ubuntu/install/dind/daemon.json /etc/docker/daemon.json # Copy install scripts COPY ./src/ $INST_DIR diff --git a/dockerfile-kasm-ubuntu-noble-dind-rootless b/dockerfile-kasm-ubuntu-noble-dind-rootless index c8fe20f..4d9db8e 100644 --- a/dockerfile-kasm-ubuntu-noble-dind-rootless +++ b/dockerfile-kasm-ubuntu-noble-dind-rootless @@ -18,7 +18,11 @@ COPY ./src/ubuntu/install/dind_rootless/modprobe /usr/local/bin/modprobe RUN chmod +x /usr/local/bin/modprobe ENV XDG_RUNTIME_DIR=/docker \ DOCKER_HOST=unix:///docker/docker.sock -RUN mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR +RUN mkdir -p $XDG_RUNTIME_DIR && chown 1000:0 $XDG_RUNTIME_DIR && \ + mkdir -p /home/kasm-user/.config/docker && \ + chown -R 1000:0 /home/kasm-user/.config +COPY ./src/ubuntu/install/dind_rootless/daemon.json /home/kasm-user/.config/docker/daemon.json +RUN chown 1000:0 /home/kasm-user/.config/docker/daemon.json ### Envrionment config ENV DEBIAN_FRONTEND=noninteractive \ diff --git a/src/ubuntu/install/dind/daemon.json b/src/ubuntu/install/dind/daemon.json new file mode 100644 index 0000000..514d027 --- /dev/null +++ b/src/ubuntu/install/dind/daemon.json @@ -0,0 +1,3 @@ +{ + "storage-driver": "fuse-overlayfs" +} diff --git a/src/ubuntu/install/dind_rootless/daemon.json b/src/ubuntu/install/dind_rootless/daemon.json new file mode 100644 index 0000000..514d027 --- /dev/null +++ b/src/ubuntu/install/dind_rootless/daemon.json @@ -0,0 +1,3 @@ +{ + "storage-driver": "fuse-overlayfs" +}