aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra/cifuzz/docker.py
diff options
context:
space:
mode:
authorGravatar Catena cyber <35799796+catenacyber@users.noreply.github.com>2022-01-13 20:27:53 +0100
committerGravatar GitHub <noreply@github.com>2022-01-13 14:27:53 -0500
commit8e9c92798798d11048cd0376642d7d06924248f7 (patch)
treef2b8a3d5300a5c28ecdb8d62f7f488640d5bf7d1 /infra/cifuzz/docker.py
parent7490e8a466e40c3ac4c092a26f737c5276c4a860 (diff)
[clusterfuzzlite] Support gitlab (#7073)
Diffstat (limited to 'infra/cifuzz/docker.py')
-rw-r--r--infra/cifuzz/docker.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/infra/cifuzz/docker.py b/infra/cifuzz/docker.py
index f957b4bf..30a08724 100644
--- a/infra/cifuzz/docker.py
+++ b/infra/cifuzz/docker.py
@@ -21,6 +21,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
import constants
import utils
+import environment
BASE_BUILDER_TAG = 'gcr.io/oss-fuzz-base/base-builder'
PROJECT_TAG_PREFIX = 'gcr.io/oss-fuzz/'
@@ -79,7 +80,8 @@ def get_base_docker_run_args(workspace,
'OUT': workspace.out
}
docker_args += get_docker_env_vars(env_mapping)
- docker_container = utils.get_container_name()
+ docker_container = environment.get('CFL_CONTAINER_ID',
+ utils.get_container_name())
logging.info('Docker container: %s.', docker_container)
if docker_container and not docker_in_docker:
# Don't map specific volumes if in a docker container, it breaks when