Skip to content

Commit 7151dc5

Browse files
committed
Also allow compilation of mbedos bits in the vscode image
1 parent 6593add commit 7151dc5

File tree

1 file changed

+9
-4
lines changed
  • integrations/docker/images/vscode/chip-build-vscode

1 file changed

+9
-4
lines changed

integrations/docker/images/vscode/chip-build-vscode/Dockerfile

+9-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FROM ghcr.io/project-chip/chip-build-nrf-platform:${VERSION} AS nrf
44
FROM ghcr.io/project-chip/chip-build-efr32:${VERSION} AS efr32
55
FROM ghcr.io/project-chip/chip-build-android:${VERSION} AS android
66
FROM ghcr.io/project-chip/chip-build-esp32-qemu:${VERSION} as esp32
7-
FROM ghcr.io/project-chip/chip-build-mbed-os:${VERSION} AS mbedos
87
FROM ghcr.io/project-chip/chip-build-telink:${VERSION} AS telink
98
FROM ghcr.io/project-chip/chip-build-infineon:${VERSION} AS p6
109
FROM ghcr.io/project-chip/chip-build-tizen:${VERSION} AS tizen
@@ -36,9 +35,6 @@ COPY --from=android /opt/android/sdk /opt/android/sdk
3635
COPY --from=android /opt/android/android-ndk-r23c /opt/android/android-ndk-r23c
3736
COPY --from=android /usr/lib/kotlinc /usr/lib/kotlinc
3837

39-
# FIXME: OpenOCD was removed during the move to infineon's repo
40-
# COPY --from=mbedos /opt/openocd/ /opt/openocd/
41-
4238
COPY --from=p6 /opt/ModusToolbox /opt/ModusToolbox
4339

4440
COPY --from=telink /opt/telink/zephyrproject /opt/telink/zephyrproject
@@ -78,6 +74,15 @@ RUN set -x \
7874
&& chmod -R a+w /opt/android/sdk/licenses \
7975
&& : # last line
8076

77+
# mbedos requirements are generally just PIP packages
78+
RUN set -x \
79+
&& pip3 install --break-system-packages --no-cache-dir -U mbed-cli==1.10.5 mbed-tools==7.44.0 \
80+
&& : # last line
81+
RUN set -x \
82+
&& mbed config -G GCC_ARM_PATH /opt/mbed-os-toolchain/gcc-arm-none-eabi-9-2019-q4-major/bin/ \
83+
&& mbed toolchain -G -s GCC_ARM \
84+
&& : # last line
85+
8186
# Required for the Tizen SDK:
8287
# - zip
8388
# Required for the Open IoT SDK platform

0 commit comments

Comments
 (0)