Skip to content

Commit

Permalink
Fix exclude argument to not exclude /usr/include/<triple>/sys
Browse files Browse the repository at this point in the history 
Signed-off-by: Saikrishna Arcot <[email protected]>
  • Loading branch information
@saiarcot895
saiarcot895 committed Jan 10, 2025
1 parent 2bdcd69 commit da5c8a8
Show file tree
Hide file tree
Showing 45 changed files with 45 additions and 45 deletions.
2 changes: 1 addition & 1 deletion dockers/docker-config-engine-bookworm/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ RUN apt-get purge -y \

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /
2 changes: 1 addition & 1 deletion dockers/docker-config-engine-bullseye/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ RUN apt-get purge -y \

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /
2 changes: 1 addition & 1 deletion dockers/docker-database/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ COPY ["multi_database_config.json.j2", "/usr/share/sonic/templates/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/docker-database-init.sh"]
2 changes: 1 addition & 1 deletion dockers/docker-dhcp-relay/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ RUN rm -f /etc/rsyslog.d/events_info.json

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Pass the image_version to container
ENV IMAGE_VERSION=$image_version
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-dhcp-server/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ COPY ["cli", "/cli/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Pass the image_version to container
ENV IMAGE_VERSION=$image_version
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-eventd/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Pass the image_version to container
ENV IMAGE_VERSION=$image_version
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-fpm-frr/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ RUN rm -f /etc/rsyslog.d/events_info.json

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/bin/docker_init.sh"]
2 changes: 1 addition & 1 deletion dockers/docker-iccpd/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN chmod +x /usr/bin/start.sh /usr/bin/iccpd.sh

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-lldp/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Pass the image_version to container
ENV IMAGE_VERSION=$image_version
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-macsec/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY ["cli", "/cli/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-mux/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY ["*.j2", "/usr/share/sonic/templates/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/bin/docker-init.sh"]
2 changes: 1 addition & 1 deletion dockers/docker-nat/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-orchagent/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN rm -f /etc/rsyslog.d/events_info.json

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/bin/docker-init.sh"]
2 changes: 1 addition & 1 deletion dockers/docker-platform-monitor/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ RUN chmod 755 /usr/bin/docker_init.sh

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Pass the image_version to container
ENV IMAGE_VERSION=$image_version
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-router-advertiser/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Pass the image_version to container
ENV IMAGE_VERSION=$image_version
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-sflow/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ COPY ["port_index_mapper.py", "/usr/bin"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-snmp/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ EXPOSE 161/udp 162/udp

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Enable -O for all Python calls
ENV PYTHONOPTIMIZE=1
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-sonic-bmp/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN touch /var/log/openbmpd.log

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-sonic-gnmi/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-sonic-mgmt-framework/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN apt-get remove -y g++ python3-dev

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-sonic-p4rt/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-sonic-restapi/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-sonic-telemetry/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-swss-layer-bookworm/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ RUN apt-get install iputils-ping

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-swss-layer-bullseye/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ RUN apt-get install iputils-ping

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion dockers/docker-teamd/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ COPY ["critical_processes", "/etc/supervisor"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/broadcom/docker-syncd-brcm-dnx-rpc/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN apt-get -y purge \

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/broadcom/docker-syncd-brcm-dnx/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ COPY ["critical_processes", "/etc/supervisor/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN apt-get -y purge \

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/broadcom/docker-syncd-brcm/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ COPY ["critical_processes", "/etc/supervisor/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/components/docker-gbsyncd-broncos/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ RUN chmod +x /usr/bin/dsserve

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENTRYPOINT ["/usr/bin/docker-init.sh"]
2 changes: 1 addition & 1 deletion platform/components/docker-gbsyncd-credo/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENTRYPOINT ["/usr/bin/docker-init.sh"]
2 changes: 1 addition & 1 deletion platform/marvell-teralynx/docker-saiserver-mrvl-teralynx/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ RUN rm -rf /debs

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/marvell-teralynx/docker-syncd-mrvl-teralynx-rpc/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN rm -rf /root/deps

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/marvell-teralynx/docker-syncd-mrvl-teralynx/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ COPY ["critical_processes", "/etc/supervisor/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/marvell/docker-saiserver-mrvl/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN rm -rf /debs

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/marvell/docker-syncd-mrvl-rpc/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN rm -rf /root/deps

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/marvell/docker-syncd-mrvl/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ COPY ["critical_processes", "/etc/supervisor/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/mellanox/docker-saiserver-mlnx/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN rm -rf /debs

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/mellanox/docker-syncd-mlnx-rpc/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ RUN apt-get -y purge \

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ COPY ["lib/port_utils.py", "/usr/lib"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/vs/docker-dash-engine/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ COPY ["start.sh", "/usr/bin/"]

FROM $BASE

## RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
## RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /
COPY --from=base / /

## ENTRYPOINT ["/usr/bin/supervisord"]
Expand Down
2 changes: 1 addition & 1 deletion platform/vs/docker-gbsyncd-vs/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ COPY ["critical_processes", "/etc/supervisor/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]
2 changes: 1 addition & 1 deletion platform/vs/docker-sonic-vs/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ RUN mkdir -p /var/warmboot/teamd

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

# Set PLATFORM and HWSKU environment variables
ENV PLATFORM=x86_64-kvm_x86_64-r0
Expand Down
2 changes: 1 addition & 1 deletion platform/vs/docker-syncd-vs/Dockerfile.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ COPY ["critical_processes", "/etc/supervisor/"]

FROM $BASE

RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=sys --exclude=resolv.conf /changes-to-image/ /
RUN --mount=type=bind,from=base,target=/changes-to-image rsync -axAX --no-D --exclude=/sys --exclude=resolv.conf /changes-to-image/ /

ENV DEBIAN_FRONTEND=noninteractive
ENTRYPOINT ["/usr/local/bin/supervisord"]

0 comments on commit da5c8a8

Please sign in to comment.