Skip to content
Snippets Groups Projects
Commit b19ec6e2 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

fix: no need to patch since already in 20.10.17

parent 652d459d
No related tags found
1 merge request!1fix: add seccomp profiles
Pipeline #36259 failed
Stage: phase1
Stage: phase2
Stage: phase3
Stage: phase4
Stage: phase5
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 5 deletions
ubuntu_dind/Dockerfile
+ 1
− 5
View file @ b19ec6e2
...@@ -45,14 +45,10 @@ RUN cd /tmp \ ...@@ -45,14 +45,10 @@ RUN cd /tmp \
RUN export VERSION=20.10.17 \ RUN export VERSION=20.10.17 \
&& curl -sSL https://get.docker.com/ | sh && curl -sSL https://get.docker.com/ | sh
# Get full moby repo and keep seccomp profiles # Get full moby repo and keep seccomp profiles
RUN git clone -b v20.10.17 https://github.com/moby/moby.git /tmp/moby \ RUN git clone -b v20.10.17 --depth=1 https://github.com/moby/moby.git /tmp/moby \
&& mkdir -p /etc/docker/profiles/ \ && mkdir -p /etc/docker/profiles/ \
&& cp -r /tmp/moby/profiles/seccomp/ /etc/docker/profiles \ && cp -r /tmp/moby/profiles/seccomp/ /etc/docker/profiles \
&& rm -r /tmp/moby && rm -r /tmp/moby
# Patch for incorrect clone3 syscall return code
ADD https://github.com/moby/moby/commit/9f6b562dd12ef7b1f9e2f8e6f2ab6477790a6594.patch /tmp/seccomp.patch
RUN cd /etc/docker \
&& patch -p1 < /tmp/seccomp.patch
# Install the magic wrapper. # Install the magic wrapper.
ADD ./wrapdocker /usr/local/bin/wrapdocker ADD ./wrapdocker /usr/local/bin/wrapdocker
RUN chmod +x /usr/local/bin/wrapdocker RUN chmod +x /usr/local/bin/wrapdocker
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment