Skip to content

Commit c220c37

Browse files
Update devcontainer to support python and kconfig (#3290)
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
1 parent 112fac5 commit c220c37

12 files changed

Lines changed: 25 additions & 19 deletions

.devcontainer/All/Dockerfile.All

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-all:v2.62
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.63

.devcontainer/All/Dockerfile.All.SRC

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,9 +146,8 @@ RUN mkdir -p $HEX2DFU_PATH \
146146
&& curl -o $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
147147
&& chmod +x $HEX2DFU_PATH/hex2dfu
148148

149-
# Creating static link python for pyhton3
150-
RUN ln -fs /usr/bin/python3 /usr/bin/python \
151-
&& pip3 install pyserial
149+
# Installing python dependencies for the container
150+
RUN pip3 install --no-cache-dir pyserial "kconfiglib>=14.1.0"
152151

153152
# Install ESP-IDF
154153
ENV IDF_PATH=/sources/esp-idf
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-chibios:v1.37
1+
FROM ghcr.io/nanoframework/dev-container-chibios:v1.38

.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN wget $CMAKE_SCRIPT \
2626
&& /tmp/dc-downloads/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
2727
&& rm /tmp/dc-downloads/cmake-install.sh
2828

29-
FROM ubuntu:latest AS devcontainer
29+
FROM python:3.11 AS devcontainer
3030

3131
# Avoid warnings by switching to noninteractive
3232
ENV DEBIAN_FRONTEND=noninteractive
@@ -90,6 +90,9 @@ RUN mkdir -p $HEX2DFU_PATH \
9090
&& curl -o $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
9191
&& chmod +x $HEX2DFU_PATH/hex2dfu
9292

93+
# Installing python dependencies for the container
94+
RUN pip3 install --no-cache-dir pyserial "kconfiglib>=14.1.0"
95+
9396
# Clean up downloaded files
9497
RUN apt-get autoremove -y \
9598
&& apt-get clean -y \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-esp32:v2.40
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v2.41

.devcontainer/ESP32/Dockerfile.ESP32.SRC

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./so
7373
# >>> IDF MIGRATION: update the branch tag to the new IDF version <<<
7474
RUN git clone --branch v5.5.4 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
7575

76-
# Creating static link python for pyhton3
77-
RUN ln -fs /usr/bin/python3 /usr/bin/python \
78-
&& pip3 install pyserial
76+
# Installing python dependencies for the container
77+
RUN pip3 install --no-cache-dir pyserial "kconfiglib>=14.1.0"
7978

8079
# copy from our other container
8180
COPY --from=downloader /tmp/dc-extracted/cmake /usr/bin/cmake
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.08
1+
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.09

.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN wget $CMAKE_SCRIPT \
2626
&& /tmp/dc-downloads/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
2727
&& rm /tmp/dc-downloads/cmake-install.sh
2828

29-
FROM python:3.10 AS devcontainer
29+
FROM python:3.11 AS devcontainer
3030

3131
# Avoid warnings by switching to noninteractive
3232
ENV DEBIAN_FRONTEND=noninteractive
@@ -75,9 +75,8 @@ COPY --from=downloader /tmp/dc-extracted/cmake /usr/bin/cmake
7575

7676
ENV PATH=/usr/bin/cmake/bin:${PATH}
7777

78-
# Creating static link python for pyhton3
79-
RUN ln -fs /usr/bin/python3 /usr/bin/python \
80-
&& pip3 install pyserial
78+
# Installing python dependencies for the container
79+
RUN pip3 install --no-cache-dir pyserial "kconfiglib>=14.1.0"
8180

8281
# Clean up downloaded files
8382
RUN apt-get autoremove -y \

.devcontainer/TI/Dockerfile.TI

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-ti:v1.27
1+
FROM ghcr.io/nanoframework/dev-container-ti:v1.28

.devcontainer/TI/Dockerfile.TI.SRC

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN mkdir -p /tmp/dc-extracted/titools \
3232
&& curl -o /tmp/dc-downloads/titools.zip $TI_TOOL_URL -L \
3333
&& unzip -d /tmp/dc-extracted/titools /tmp/dc-downloads/titools.zip
3434

35-
FROM ubuntu:latest AS devcontainer
35+
FROM python:3.11 AS devcontainer
3636

3737
# Avoid warnings by switching to noninteractive
3838
ENV DEBIAN_FRONTEND=noninteractive
@@ -76,6 +76,9 @@ COPY --from=downloader /tmp/dc-extracted/cmake /usr/bin/cmake
7676

7777
ENV PATH=/usr/bin/cmake/bin:${PATH}
7878

79+
# Installing python dependencies for the container
80+
RUN pip3 install --no-cache-dir pyserial "kconfiglib>=14.1.0"
81+
7982
# Clean up downloaded files
8083
RUN apt-get autoremove -y \
8184
&& apt-get clean -y \

0 commit comments

Comments
 (0)