From b8dd2078a1265be678a3ea830154af26d36ca52c Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 25 Nov 2022 16:57:02 +0100 Subject: [PATCH] remove nsjail from the non enterprise image --- Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70f8e2d852..653b2bdbe9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,9 @@ FROM debian:buster-slim as nsjail WORKDIR /nsjail -RUN apt-get -y update \ +ARG features="" + +RUN if [[ "$features" == *"enterprise"* ]]; then apt-get -y update \ && apt-get install -y \ bison=2:3.3.* \ flex=2.6.* \ @@ -13,11 +15,12 @@ RUN apt-get -y update \ libnl-route-3-dev=3.4.* \ make=4.2.* \ pkg-config=0.29-6 \ - protobuf-compiler=3.6.* + protobuf-compiler=3.6.*; fi -RUN git clone -b master --single-branch https://github.com/google/nsjail.git . \ + +RUN if [[ "$features" == *"enterprise"* ]]; then git clone -b master --single-branch https://github.com/google/nsjail.git . \ && git checkout dccf911fd2659e7b08ce9507c25b2b38ec2c5800 -RUN make +RUN if [[ "$features" == *"enterprise"* ]]; then make; else touch nsjail fi FROM rust:slim-buster AS rust_base