Skip to content

Commit 3ed5f35

Browse files
josesimoesjosesimoes
authored
Update CMake install in dev containers (#2475)
***NO_CI***
1 parent bd5521d commit 3ed5f35

File tree

10 files changed

+20
-47
lines changed

10 files changed

+20
-47
lines changed

‎.devcontainer/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.24
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.25

‎.devcontainer/Dockerfile.AzureRTOS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.10
1+
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.11

‎.devcontainer/Dockerfile.ChibiOS‎

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.10
1+
FROM ghcr.io/nanoframework/dev-container-chibios:v1.11

‎.devcontainer/Dockerfile.ESP32‎

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.19
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v2.20

‎.devcontainer/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.10
1+
FROM ghcr.io/nanoframework/dev-container-ti:v1.11

‎.devcontainer/sources/Dockerfile.All‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@ RUN apt-get update \
77
unzip
88

99
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
10-
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
1111
&& curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \
1212
&& xz -d /tmp/dc-downloads/gcc-arm.tar.xz \
1313
&& tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
1414
&& rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
1515

16-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.23/cmake-3.23.0-linux-x86_64.sh
17-
RUN curl -o /tmp/dc-downloads/cmake.sh $CMAKE_SCRIPT \
18-
&& chmod +x /tmp/dc-downloads/cmake.sh \
19-
&& bash /tmp/dc-downloads/cmake.sh --skip-license --prefix=/tmp/dc-extracted/cmake
20-
2116
# This is TI XDC tools for linux. Cheack all versions here: http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/index.html
2217
ARG TI_TOOL_URL=http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/3_62_00_08/exports/xdccore/xdctools_3_62_00_08_core_linux.zip
2318
RUN mkdir -p /tmp/dc-extracted/titools \
@@ -49,7 +44,8 @@ RUN apt-get update \
4944
python3 \
5045
python3-pip \
5146
nodejs \
52-
libffi-dev
47+
libffi-dev \
48+
cmake
5349

5450
# Create needed directories
5551
RUN mkdir -p /usr/local/bin/gcc \
@@ -94,7 +90,6 @@ ENV PATH=$ARM_GCC_PATH/bin:${PATH}
9490

9591
# Copy from our other container
9692
COPY --from=downloader /tmp/dc-extracted/gcc $ARM_GCC_PATH
97-
COPY --from=downloader /tmp/dc-extracted/cmake /usr
9893
COPY --from=downloader /tmp/dc-extracted/titools/xdctools_3_62_00_08_core /usr/local/bin/titools
9994
# COPY ./scripts/git-pull-repos.sh /usr/local/git-pull-repos.sh
10095

‎.devcontainer/sources/Dockerfile.AzureRTOS‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@ RUN apt-get update \
77
unzip
88

99
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
10-
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
1111
&& curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \
1212
&& xz -d /tmp/dc-downloads/gcc-arm.tar.xz \
1313
&& tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
1414
&& rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
1515

16-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.23/cmake-3.23.0-linux-x86_64.sh
17-
RUN curl -o /tmp/dc-downloads/cmake.sh $CMAKE_SCRIPT \
18-
&& chmod +x /tmp/dc-downloads/cmake.sh \
19-
&& bash /tmp/dc-downloads/cmake.sh --skip-license --prefix=/tmp/dc-extracted/cmake
20-
2116
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
2217

2318
# Avoid warnings by switching to noninteractive
@@ -38,7 +33,8 @@ RUN apt-get update \
3833
clang-format \
3934
curl \
4035
ninja-build \
41-
srecord
36+
srecord \
37+
cmake
4238

4339
# Create needed directories
4440
RUN mkdir -p /usr/local/bin/gcc \
@@ -63,7 +59,6 @@ ENV PATH=$ARM_GCC_PATH/bin:${PATH}
6359

6460
# Copy from our other container
6561
COPY --from=downloader /tmp/dc-extracted/gcc $ARM_GCC_PATH
66-
COPY --from=downloader /tmp/dc-extracted/cmake /usr
6762
# COPY ./scripts/git-pull-repos.sh /usr/local/git-pull-repos.sh
6863

6964
# Putting hex2dfu in the container

‎.devcontainer/sources/Dockerfile.ChibiOS‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@ RUN apt-get update \
77
unzip
88

99
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
10-
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
1111
&& curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \
1212
&& xz -d /tmp/dc-downloads/gcc-arm.tar.xz \
1313
&& tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
1414
&& rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
1515

16-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.23/cmake-3.23.0-linux-x86_64.sh
17-
RUN curl -o /tmp/dc-downloads/cmake.sh $CMAKE_SCRIPT \
18-
&& chmod +x /tmp/dc-downloads/cmake.sh \
19-
&& bash /tmp/dc-downloads/cmake.sh --skip-license --prefix=/tmp/dc-extracted/cmake
20-
2116
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
2217

2318
# Avoid warnings by switching to noninteractive
@@ -38,7 +33,8 @@ RUN apt-get update \
3833
clang-format \
3934
curl \
4035
ninja-build \
41-
srecord
36+
srecord \
37+
cmake
4238

4339
# Create needed directories
4440
RUN mkdir -p /usr/local/bin/gcc \
@@ -63,7 +59,6 @@ ENV PATH=$ARM_GCC_PATH/bin:${PATH}
6359

6460
# Copy from our other container
6561
COPY --from=downloader /tmp/dc-extracted/gcc $ARM_GCC_PATH
66-
COPY --from=downloader /tmp/dc-extracted/cmake /usr
6762
# COPY ./scripts/git-pull-repos.sh /usr/local/git-pull-repos.sh
6863

6964
# Putting hex2dfu in the container

‎.devcontainer/sources/Dockerfile.ESP32‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ RUN apt-get update \
66
bzip2 \
77
unzip
88

9-
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake
10-
11-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.23/cmake-3.23.0-linux-x86_64.sh
12-
RUN curl -o /tmp/dc-downloads/cmake.sh $CMAKE_SCRIPT \
13-
&& chmod +x /tmp/dc-downloads/cmake.sh \
14-
&& bash /tmp/dc-downloads/cmake.sh --skip-license --prefix=/tmp/dc-extracted/cmake
9+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc
1510

1611
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
1712

@@ -36,7 +31,8 @@ RUN apt-get update \
3631
python3 \
3732
python3-pip \
3833
nodejs \
39-
libffi-dev
34+
libffi-dev \
35+
cmake
4036

4137
# Create needed directories
4238
RUN mkdir -p /usr/local/bin/gcc
@@ -48,9 +44,6 @@ RUN git clone --branch mbedtls-2.28.1 https://github.com/ARMmbed/mbedtls.git --d
4844
# Clone ESP-IDF
4945
RUN git clone --branch v4.4.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
5046

51-
# Copy from our other container
52-
COPY --from=downloader /tmp/dc-extracted/cmake /usr
53-
5447
# Creating static link python for pyhton3
5548
RUN ln -fs /usr/bin/python3 /usr/bin/python \
5649
&& pip3 install pyserial

‎.devcontainer/sources/Dockerfile.TI‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,12 @@ RUN apt-get update \
77
unzip
88

99
ARG GCC_URI=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz
10-
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc \
1111
&& curl -o /tmp/dc-downloads/gcc-arm.tar.xz $GCC_URI \
1212
&& xz -d /tmp/dc-downloads/gcc-arm.tar.xz \
1313
&& tar -xvf /tmp/dc-downloads/gcc-arm.tar -C /tmp/dc-extracted/gcc --strip-components 1 \
1414
&& rm -rf /tmp/dc-extracted/gcc/share/doc/ /tmp/dc-extracted/gcc/share/gcc-arm-none-eabi/samples/
1515

16-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.23/cmake-3.23.0-linux-x86_64.sh
17-
RUN curl -o /tmp/dc-downloads/cmake.sh $CMAKE_SCRIPT \
18-
&& chmod +x /tmp/dc-downloads/cmake.sh \
19-
&& bash /tmp/dc-downloads/cmake.sh --skip-license --prefix=/tmp/dc-extracted/cmake
20-
2116
# This is TI XDC tools for linux. Cheack all versions here: http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/index.html
2217
ARG TI_TOOL_URL=http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/3_62_00_08/exports/xdccore/xdctools_3_62_00_08_core_linux.zip
2318
RUN mkdir -p /tmp/dc-extracted/titools \
@@ -43,7 +38,8 @@ RUN apt-get update \
4338
curl \
4439
ninja-build \
4540
srecord \
46-
nodejs
41+
nodejs \
42+
cmake
4743

4844
# Create needed directories
4945
RUN mkdir -p /usr/local/bin/gcc \
@@ -63,7 +59,6 @@ ENV PATH=$ARM_GCC_PATH/bin:${PATH}
6359

6460
# Copy from our other container
6561
COPY --from=downloader /tmp/dc-extracted/gcc $ARM_GCC_PATH
66-
COPY --from=downloader /tmp/dc-extracted/cmake /usr
6762
COPY --from=downloader /tmp/dc-extracted/titools/xdctools_3_62_00_08_core /usr/local/bin/titools
6863
# COPY ./scripts/git-pull-repos.sh /usr/local/git-pull-repos.sh
6964

0 commit comments

Comments
 (0)