From 64a13e76815cc93d3291c7641adb53e92d08f31a Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 20 Aug 2024 15:24:38 -0700 Subject: [PATCH] Update docker-dash-engine Signed-off-by: Saikrishna Arcot --- platform/vs/docker-dash-engine/Dockerfile.j2 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/platform/vs/docker-dash-engine/Dockerfile.j2 b/platform/vs/docker-dash-engine/Dockerfile.j2 index a3d2ebf034ae..56818e68e2f7 100644 --- a/platform/vs/docker-dash-engine/Dockerfile.j2 +++ b/platform/vs/docker-dash-engine/Dockerfile.j2 @@ -1,5 +1,7 @@ -FROM p4lang/behavioral-model@sha256:ce45720e28a96a50f275c1b511cd84c2558b62f2cf7a7e506765183bc3fb2e32 -## FROM docker-config-engine-bookworm-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} +ARG BASE=p4lang/behavioral-model@sha256:ce45720e28a96a50f275c1b511cd84c2558b62f2cf7a7e506765183bc3fb2e32 +## ARG BASE=docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}} + +FROM $BASE as base ## Make apt-get non-interactive ENV DEBIAN_FRONTEND=noninteractive @@ -15,9 +17,9 @@ COPY ["start.sh", "/usr/bin/"] ## COPY ["files/supervisor-proc-exit-listener", "/usr/bin"] ## COPY ["critical_processes", "/etc/supervisor/"] -## Clean up -RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y -RUN rm -rf /debs +FROM $BASE + +COPY --from=base / / ## ENTRYPOINT ["/usr/bin/supervisord"] ENTRYPOINT ["/usr/bin/start.sh"]