diff --git a/docker.go b/docker.go index 43a6adf..44ce44d 100644 --- a/docker.go +++ b/docker.go @@ -341,7 +341,10 @@ func commandDaemon(daemon Daemon) *exec.Cmd { args := []string{ "--data-root", daemon.StoragePath, "--host=unix:///var/run/docker.sock", - "--seccomp-profile=/etc/docker/default.json", + } + + if _, err := os.Stat("/etc/docker/default.json"); err == nil { + args = append(args, "--seccomp-profile=/etc/docker/default.json") } if daemon.StorageDriver != "" { diff --git a/docker/docker/Dockerfile.linux.amd64 b/docker/docker/Dockerfile.linux.amd64 index 761835d..c39c578 100644 --- a/docker/docker/Dockerfile.linux.amd64 +++ b/docker/docker/Dockerfile.linux.amd64 @@ -2,14 +2,5 @@ FROM docker:19.03.8-dind ENV DOCKER_HOST=unix:///var/run/docker.sock -RUN apk --update add --virtual .build-deps curl && \ - mkdir -p /etc/docker/ && \ - curl -SsL -o /etc/docker/default.json https://raw.githubusercontent.com/moby/moby/19.03/profiles/seccomp/default.json && \ - sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /etc/docker/default.json && \ - chmod 600 /etc/docker/default.json && \ - apk del .build-deps && \ - rm -rf /var/cache/apk/* && \ - rm -rf /tmp/* - ADD release/linux/amd64/drone-docker /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] diff --git a/docker/docker/Dockerfile.linux.arm64 b/docker/docker/Dockerfile.linux.arm64 index 2604ea7..2a70c6a 100644 --- a/docker/docker/Dockerfile.linux.arm64 +++ b/docker/docker/Dockerfile.linux.arm64 @@ -2,14 +2,5 @@ FROM arm64v8/docker:19.03.8-dind ENV DOCKER_HOST=unix:///var/run/docker.sock -RUN apk --update add --virtual .build-deps curl && \ - mkdir -p /etc/docker/ && \ - curl -SsL -o /etc/docker/default.json https://raw.githubusercontent.com/moby/moby/19.03/profiles/seccomp/default.json && \ - sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /etc/docker/default.json && \ - chmod 600 /etc/docker/default.json && \ - apk del .build-deps && \ - rm -rf /var/cache/apk/* && \ - rm -rf /tmp/* - ADD release/linux/arm64/drone-docker /bin/ ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"]