Mirrors/kasm-workspaces-images
1
0
Fork 0
mirror of https://github.com/kasmtech/workspaces-images.git synced 2026-01-23 02:25:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/KASM-7979-fix_dind_images_1.17.0' into 'release/1.17.0'

Browse source 
KASM-7979 fix dind images

See merge request kasm-technologies/internal/workspaces-images!384
This commit is contained in:
Richard Koliser 2025-12-24 14:42:20 +00:00
commit f93a4f8106
6 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dockerfile-kasm-ubuntu-jammy-dind
View file

@ -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

6
dockerfile-kasm-ubuntu-jammy-dind-rootless
View file

@ -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 \

1
dockerfile-kasm-ubuntu-noble-dind
View file

@ -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

6
dockerfile-kasm-ubuntu-noble-dind-rootless
View file

@ -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 \

3
src/ubuntu/install/dind/daemon.json Normal file
View file

@ -0,0 +1,3 @@
{
"storage-driver": "fuse-overlayfs"
}

3
src/ubuntu/install/dind_rootless/daemon.json Normal file
View file

@ -0,0 +1,3 @@
{
"storage-driver": "fuse-overlayfs"
}