Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dockerfiles to do staged builds #19952

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b288a99
Upgrade most of the Dockerfiles to do staged builds
saiarcot895 Aug 19, 2024
d910457
Remove the Dockerfile.cleanup for docker-dash-engine
saiarcot895 Aug 19, 2024
5e61a87
Fix typos/duplicate lines in dockerfiles
saiarcot895 Aug 19, 2024
1cb7f15
Fix version control for dockers not working
saiarcot895 Aug 19, 2024
1e2a34b
Don't simulate removal, actually do it
saiarcot895 Aug 20, 2024
edf701d
Re-add purge command that was accidentally removed for orchagent
saiarcot895 Aug 20, 2024
e153fa4
Update gbsyncd Dockerfiles, and use macros for docker-syncd-brcm
saiarcot895 Aug 20, 2024
939af50
Update docker-dash-engine
saiarcot895 Aug 20, 2024
21c9591
Fix macro includes
saiarcot895 Aug 21, 2024
74cc236
Make sure environment variables are present in the second (final) stage
saiarcot895 Sep 1, 2024
ef23450
Fix the docker root cleanup and creation commands
saiarcot895 Sep 28, 2024
1e31a68
Set the nofile ulimit for the slave container to 1024:1048576
saiarcot895 Sep 28, 2024
7ea1005
Marvell: Update Dockerfiles for staged builds (#21)
krismarvell Oct 16, 2024
0b85785
Work around Docker overlayfs inconsistencies by using rsync
saiarcot895 Jan 9, 2025
0f81931
Fix docker builds
saiarcot895 Jan 10, 2025
6443892
Fix armhf and arm64 build
saiarcot895 Jan 10, 2025
1678fbd
Remove armhf and arm64 development packages as well
saiarcot895 Jan 10, 2025
2bdcd69
Fix base container for Broadcom syncd
saiarcot895 Jan 10, 2025
da5c8a8
Fix exclude argument to not exclude /usr/include/<triple>/sys
saiarcot895 Jan 10, 2025
07f8c02
Merge remote-tracking branch 'origin/master' into update-dockerfiles
saiarcot895 Jan 15, 2025
803314c
Remove documentation about SONIC_USE_DOCKER_BUILDKIT
saiarcot895 Jan 24, 2025
87e2373
Merge remote-tracking branch 'origin/master' into update-dockerfiles
saiarcot895 Feb 23, 2025
7127dc2
Merge remote-tracking branch 'origin/master' into update-dockerfiles
saiarcot895 Mar 13, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove armhf and arm64 development packages as well
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
saiarcot895 committed Jan 10, 2025
commit 1678fbdc5355a38c48bbcf269b35e30010ef0698
17 changes: 10 additions & 7 deletions dockers/docker-config-engine-bookworm/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -52,13 +52,16 @@ COPY ["files/container_startup.py", "/usr/share/sonic/scripts/"]
COPY ["00-load-omprog.conf", "/etc/rsyslog.d/"]

## Clean up
RUN apt-get purge -y \
python3-dev \
build-essential && \
apt-get clean -y && \
apt-get autoclean -y && \
apt-get autoremove -y && \
rm -rf /debs /python-wheels ~/.cache

{%- if CONFIGURED_ARCH == "armhf" or CONFIGURED_ARCH == "arm64" %}
RUN apt-get purge -y \
libxslt-dev \
libz-dev
{%- endif %}

RUN apt-get purge -y \
python3-dev \
build-essential

FROM $BASE

2 changes: 0 additions & 2 deletions dockers/docker-platform-monitor/Dockerfile.j2
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@ RUN apt-get update && \
apt-get install -y \
build-essential \
python3-dev \
libc6-dev \
librrd8 \
librrd-dev \
rrdtool \
@@ -90,7 +89,6 @@ RUN pip3 install blkinfo
# Clean up
RUN apt-get purge -y \
build-essential \
libc6-dev \
python3-dev

COPY ["lm-sensors.sh", "/usr/bin/"]