From 9deee5770507f74de6706f0e26346a7dcb02b9bc Mon Sep 17 00:00:00 2001 From: Sean O'Hair Date: Thu, 22 Aug 2024 15:47:39 -0700 Subject: [PATCH] fix: revert as casing in dockerfile to resolve codeql vuln Signed-off-by: Sean O'Hair --- helm/Dockerfile | 2 +- src/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helm/Dockerfile b/helm/Dockerfile index 66956bf6..765ac2dc 100644 --- a/helm/Dockerfile +++ b/helm/Dockerfile @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # -FROM intel/dlstreamer:2024.1.1-dev-ubuntu22 AS base +FROM intel/dlstreamer:2024.1.1-dev-ubuntu22 as base USER root COPY helm/requirements.txt /requirements.txt diff --git a/src/Dockerfile b/src/Dockerfile index 45e1dfc8..4d61c887 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -4,10 +4,10 @@ # SPDX-License-Identifier: Apache-2.0 # -FROM intel/dlstreamer:2024.1.1-dev-ubuntu22 AS base +FROM intel/dlstreamer:2024.1.1-dev-ubuntu22 as base USER root -FROM base AS build-default +FROM base as build-default COPY ./requirements.txt /requirements.txt RUN pip3 install --upgrade pip --no-cache-dir -r /requirements.txt WORKDIR / @@ -16,7 +16,7 @@ COPY /pipelines /home/pipeline-server/pipelines COPY entrypoint.sh /script/entrypoint.sh RUN chmod +x /script/entrypoint.sh -FROM base AS build-realsense +FROM base as build-realsense RUN if [ -n "$HTTP_PROXY" ] ; then echo "Acquire::http::Proxy \"$HTTP_PROXY\";" > /etc/apt/apt.conf; fi RUN apt-get update -y || true; DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ build-essential \