Make sure environment variables are present in the second (final) stage

Signed-off-by: Saikrishna Arcot <[email protected]>

dockers/docker-database/Dockerfile.j2

@@ -51,4 +51,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/docker-database-init.sh"]

dockers/docker-dhcp-relay/Dockerfile.j2

@@ -9,9 +9,6 @@ ARG image_version
 # Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Pass the image_version to container
-ENV IMAGE_VERSION=$image_version
-
 # Update apt's cache of available packages
 RUN apt-get update
 
@@ -62,4 +59,8 @@ FROM $BASE
 
 COPY --from=base / /
 
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker_init.sh"]

dockers/docker-dhcp-server/Dockerfile.j2

@@ -9,9 +9,6 @@ ARG image_version
 ## Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Pass the image_version to container
-ENV IMAGE_VERSION=$image_version
-
 RUN apt-get update &&       \
     apt-get install -f -y   \
         tcpdump             \
@@ -56,4 +53,8 @@ FROM $BASE
 
 COPY --from=base / /
 
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker_init.sh"]

dockers/docker-eventd/Dockerfile.j2

@@ -9,9 +9,6 @@ ARG image_version
 # Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Pass the image_version to container
-ENV IMAGE_VERSION=$image_version
-
 # Update apt's cache of available packages
 RUN apt-get update
 
@@ -32,4 +29,8 @@ FROM $BASE
 
 COPY --from=base / /
 
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-fpm-frr/Dockerfile.j2

@@ -65,4 +65,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker_init.sh"]

dockers/docker-iccpd/Dockerfile.j2

@@ -29,4 +29,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-lldp/Dockerfile.j2

@@ -46,4 +46,8 @@ FROM $BASE
 
 COPY --from=base / /
 
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker-lldp-init.sh"]

dockers/docker-macsec/Dockerfile.j2

@@ -29,4 +29,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-mux/Dockerfile.j2

@@ -30,4 +30,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker-init.sh"]

dockers/docker-nat/Dockerfile.j2

@@ -29,11 +29,9 @@ COPY ["restore_nat_entries.py", "/usr/bin/"]
 COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
 COPY ["critical_processes", "/etc/supervisor"]
 
-RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
-RUN rm -rf /debs
-
 FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-orchagent/Dockerfile.j2

@@ -88,4 +88,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker-init.sh"]

dockers/docker-platform-monitor/Dockerfile.j2

@@ -101,4 +101,8 @@ FROM $BASE
 
 COPY --from=base / /
 
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker_init.sh"]

dockers/docker-router-advertiser/Dockerfile.j2

@@ -36,4 +36,8 @@ FROM $BASE
 
 COPY --from=base / /
 
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/bin/docker-init.sh"]

dockers/docker-sflow/Dockerfile.j2

@@ -32,4 +32,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-snmp/Dockerfile.j2

@@ -7,7 +7,7 @@ ARG docker_container_name
 ARG image_version
 
 # Enable -O for all Python calls
-ENV PYTHONOPTIMIZE 1
+ENV PYTHONOPTIMIZE=1
 
 # Make apt-get non-interactive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -32,15 +32,6 @@ RUN apt-get update   && \
 {{ install_debian_packages(docker_snmp_debs.split(' ')) }}
 {%- endif %}
 
-# Fix for hiredis compilation issues for ARM
-# python will throw for missing locale
-RUN apt-get install -y locales
-RUN locale-gen "en_US.UTF-8"
-RUN dpkg-reconfigure --frontend noninteractive locales
-ENV LC_CTYPE=en_US.UTF-8
-RUN sed -i '/^#.* en_US.* /s/^#//' /etc/locale.gen
-RUN locale-gen
-
 # Install dependencies used by some plugins
 RUN pip3 install --no-cache-dir \
         hiredis                             \
@@ -57,6 +48,12 @@ RUN pip3 install --no-cache-dir \
 
 RUN python3 -m sonic_ax_impl install
 
+# Clean up
+RUN apt-get -y purge     \
+        python3-dev      \
+        gcc              \
+        make
+
 COPY ["start.sh", "/usr/bin/"]
 COPY ["snmp_yml_to_configdb.py", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
@@ -71,4 +68,13 @@ FROM $BASE
 
 COPY --from=base / /
 
+# Enable -O for all Python calls
+ENV PYTHONOPTIMIZE=1
+
+# Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-sonic-gnmi/Dockerfile.j2

@@ -32,4 +32,10 @@ FROM $BASE
 
 COPY --from=base / /
 
+## Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-sonic-mgmt-framework/Dockerfile.j2

@@ -32,4 +32,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-sonic-p4rt/Dockerfile.j2

@@ -29,4 +29,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-sonic-restapi/Dockerfile.j2

@@ -27,4 +27,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-sonic-telemetry/Dockerfile.j2

@@ -31,4 +31,10 @@ FROM $BASE
 
 COPY --from=base / /
 
+## Make apt-get non-interactive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Pass the image_version to container
+ENV IMAGE_VERSION=$image_version
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]

dockers/docker-teamd/Dockerfile.j2

@@ -27,4 +27,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2

@@ -56,4 +56,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2

@@ -35,4 +35,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2

@@ -55,4 +55,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/broadcom/docker-syncd-brcm/Dockerfile.j2

@@ -35,4 +35,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/mellanox/docker-saiserver-mlnx/Dockerfile.j2

@@ -62,4 +62,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2

@@ -101,4 +101,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/mellanox/docker-syncd-mlnx/Dockerfile.j2

@@ -79,4 +79,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/vs/docker-sonic-vs/Dockerfile.j2

@@ -174,12 +174,12 @@ COPY ["frr/zebra.conf", "/etc/frr/"]
 # Create /var/warmboot/teamd folder for teammgrd
 RUN mkdir -p /var/warmboot/teamd
 
-# Set PLATFORM and HWSKU environment variables
-ENV PLATFORM=x86_64-kvm_x86_64-r0
-ENV HWSKU=Force10-S6000
-
 FROM $BASE
 
 COPY --from=base / /
 
+# Set PLATFORM and HWSKU environment variables
+ENV PLATFORM=x86_64-kvm_x86_64-r0
+ENV HWSKU=Force10-S6000
+
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/vs/docker-syncd-vs/Dockerfile.j2

@@ -37,4 +37,5 @@ FROM $BASE
 
 COPY --from=base / /
 
+ENV DEBIAN_FRONTEND=noninteractive
 ENTRYPOINT ["/usr/local/bin/supervisord"]

platform/vs/syncd-vs.mk

@@ -3,13 +3,6 @@ $(LIBSAIREDIS)_DEB_BUILD_PROFILES += syncd vs
 SYNCD_VS = syncd-vs_1.0.0_$(CONFIGURED_ARCH).deb
 $(SYNCD_VS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBSAIVS)
 
-ifeq ($(BLDENV),bookworm)
-  $(LIBSAIREDIS)_DEB_BUILD_PROFILES += dashsai
-  $(LIBSAIREDIS)_DEPENDS += $(DASH_SAI)
-  $(SYNCD_VS)_RDEPENDS += $(DASH_SAI)
-else
-  $(warning DASH_SAI cannot support this build environment $(BLDENV))
-endif
 
 
 $(eval $(call add_derived_package,$(LIBSAIREDIS),$(SYNCD_VS)))