Change the crosscompile to base image (#12828)

Signed-off-by: Victor Morales <[email protected]>
project-chip · Dec 9, 2021 · 7b66b77 · 7b66b77
1 parent 2a1cca4
commit 7b66b77
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/integrations/docker/images/chip-build-crosscompile/Dockerfile b/integrations/docker/images/chip-build-crosscompile/Dockerfile
@@ -1,9 +1,13 @@
-FROM alpine:3.15 as build
+ARG VERSION=latest
+FROM connectedhomeip/chip-build:${VERSION} as build
 
-RUN apk --no-cache add \
-    bash=5.1.8-r0 \
-    git=2.34.1-r0 \
-    wget=1.21.2-r2
+RUN set -x \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -fy --no-install-recommends \
+    git=1:2.25.1-1ubuntu3.2 \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/ \
+    && : # last line
 
 WORKDIR /opt
 # Unpack the sysroot, while also removing some rather large items in it that
@@ -22,7 +26,7 @@ RUN set -x \
     && rm -rf /opt/ubuntu-21.04-aarch64-sysroot/lib/modules \
     && : # last line
 
-FROM alpine:3.15
+FROM connectedhomeip/chip-build:${VERSION}
 
 COPY --from=build /opt/ubuntu-21.04-aarch64-sysroot/ /opt/ubuntu-21.04-aarch64-sysroot/
 

diff --git a/integrations/docker/images/chip-build/version b/integrations/docker/images/chip-build/version
@@ -1 +1 @@
-0.5.36 Version bump reason: ESP32 update to newest 4.4 commit: e104dd7f27d2e73ab0e9b614dd7b9295099069bf
+0.5.37 Version bump reason: Linux ARM Cross compile requires toolset provided by base image
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0.5.36 Version bump reason: ESP32 update to newest 4.4 commit: e104dd7f27d2e73ab0e9b614dd7b9295099069bf
		0.5.37 Version bump reason: Linux ARM Cross compile requires toolset provided by base image