From bb15360a556e4450871ed1d3f4921ebd62e16523 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Tue, 14 Jun 2022 12:35:48 +0200 Subject: [PATCH] Revert "CI: phySim container build: add SYS_PTRACE" This reverts commit 012274940658bb67ab996ceb25e229e1b6546290. --- ci-scripts/cls_containerize.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index beb71890d8..259db7bffe 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -293,14 +293,7 @@ class Containerize(): mySSH.command('sed -i -e "s#' + baseImage + ':latest#' + baseImage + ':' + baseTag + '#" docker/Dockerfile.' + pattern + self.dockerfileprefix, '\$', 5) if image != 'ran-build': mySSH.command('sed -i -e "s#' + "ran-build" + ':latest#' + "ran-build" + ':' + imageTag + '#" docker/Dockerfile.' + pattern + self.dockerfileprefix, '\$', 5) - cliBuildOptions = self.cliBuildOptions - # for the phySim images, we build with ASan. During the - # build process, we compile and execute processes, and - # therefore need the SYS_PTRACE capability to allow - # ASan to attach to these programs - if image == 'oai-physim': - cliBuildOptions += ' --cap-add SYS_PTRACE' - mySSH.command(self.cli + ' build ' + cliBuildOptions + ' --target ' + image + ' --tag ' + image + ':' + imageTag + ' --file docker/Dockerfile.' + pattern + self.dockerfileprefix + ' . > cmake_targets/log/' + image + '.log 2>&1', '\$', 1200) + mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target ' + image + ' --tag ' + image + ':' + imageTag + ' --file docker/Dockerfile.' + pattern + self.dockerfileprefix + ' . > cmake_targets/log/' + image + '.log 2>&1', '\$', 1200) # Flatten Image if image != 'ran-build': mySSH.command('python3 ./ci-scripts/flatten_image.py --tag ' + image + ':' + imageTag, '\$', 300)