From 92bb205b50518c406624a72bf25ed13a62439cfe Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Tue, 9 Mar 2021 11:57:33 -0800
Subject: [infra] Remove minijail. (#5343)

We don't need minijail tooling anymore since we aren't using it
on OSS-Fuzz.
---
 infra/base-images/base-runner/Dockerfile   |   2 -
 infra/base-images/base-runner/minijail0    | Bin 59392 -> 0 bytes
 infra/base-images/base-runner/run_minijail |  59 -----------------------------
 3 files changed, 61 deletions(-)
 delete mode 100755 infra/base-images/base-runner/minijail0
 delete mode 100755 infra/base-images/base-runner/run_minijail

(limited to 'infra')

diff --git a/infra/base-images/base-runner/Dockerfile b/infra/base-images/base-runner/Dockerfile
index 26e76adbd..5e0fa4d13 100755
--- a/infra/base-images/base-runner/Dockerfile
+++ b/infra/base-images/base-runner/Dockerfile
@@ -97,11 +97,9 @@ COPY bad_build_check \
     coverage_helper \
     dataflow_tracer.py \
     download_corpus \
-    minijail0 \
     rcfilt \
     reproduce \
     run_fuzzer \
-    run_minijail \
     parse_options.py \
     targets_list \
     test_all.py \
diff --git a/infra/base-images/base-runner/minijail0 b/infra/base-images/base-runner/minijail0
deleted file mode 100755
index 369e0bbd9..000000000
Binary files a/infra/base-images/base-runner/minijail0 and /dev/null differ
diff --git a/infra/base-images/base-runner/run_minijail b/infra/base-images/base-runner/run_minijail
deleted file mode 100755
index bf950b1e7..000000000
--- a/infra/base-images/base-runner/run_minijail
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash -eu
-# Copyright 2017 Google Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
-rm -rf /tmp/chroot
-mkdir /tmp/chroot
-
-mkdir /tmp/chroot/lib
-mkdir /tmp/chroot/lib64
-mkdir /tmp/chroot/lib32
-
-mkdir /tmp/chroot/usr
-mkdir /tmp/chroot/usr/lib
-mkdir /tmp/chroot/usr/lib32
-
-mkdir /tmp/chroot/dev
-mknod -m 666 /tmp/chroot/dev/null c 1 3
-mknod -m 666 /tmp/chroot/dev/urandom c 1 9
-
-mkdir /tmp/chroot/proc
-mkdir /tmp/chroot/tmp
-
-mkdir /tmp/chroot/bin
-cp /bin/sh /tmp/chroot/bin/sh
-cp $(which llvm-symbolizer) /tmp/chroot/bin/llvm-symbolizer
-
-FULL_EXE_PATH=$(readlink -f $1)
-EXE_DIR=$(dirname $FULL_EXE_PATH)
-mkdir -p /tmp/chroot/$EXE_DIR
-
-shift
-
-echo 'Running:'
-echo minijail0 -U -m \"0 $UID 1\" -T static \
-  -c 0 -n -v -p -l -I \
-  -k proc,/proc,proc,1 -P /tmp/chroot \
-  -b /lib,/lib,0 -b /lib64,/lib64,0 -b /lib32,/lib32,0 -b /usr/lib,/usr/lib,0 \
-  -b /usr/lib32,/usr/lib32,0 -b /tmp,/tmp,1 \
-  -b $EXE_DIR,$EXE_DIR,0 $FULL_EXE_PATH $@
-
-minijail0 -U -m "0 $UID 1" -T static \
-  -c 0 -n -v -p -l -I \
-  -k proc,/proc,proc,1 -P /tmp/chroot \
-  -b /lib,/lib,0 -b /lib64,/lib64,0 -b /lib32,/lib32,0 -b /usr/lib,/usr/lib,0 \
-  -b /usr/lib32,/usr/lib32,0 -b /tmp,/tmp,1 \
-  -b $EXE_DIR,$EXE_DIR,0 $FULL_EXE_PATH $@
-- 
cgit v1.2.3