Skip to content

Commit 2b8c7ee

Browse files
josesimoesjosesimoes
committed
Fix install of CMake in dev container
- Now using official install script and updating path. ***NO_CI***
1 parent f11f543 commit 2b8c7ee

File tree

10 files changed

+60
-35
lines changed

10 files changed

+60
-35
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.27
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.28

‎.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.14
1+
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.15

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

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

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

‎.devcontainer/sources/Dockerfile.All‎

Lines changed: 11 additions & 6 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.24/cmake-3.24.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 \
@@ -109,6 +104,16 @@ RUN mkdir -p $HEX2DFU_PATH \
109104
RUN ln -fs /usr/bin/python3 /usr/bin/python \
110105
&& pip3 install pyserial
111106

107+
ARG CMAKE_VERSION=3.24.0
108+
RUN wget https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
109+
-q -O /tmp/cmake-install.sh \
110+
&& chmod u+x /tmp/cmake-install.sh \
111+
&& mkdir /usr/bin/cmake \
112+
&& /tmp/cmake-install.sh --skip-license --prefix=/usr/bin/cmake \
113+
&& rm /tmp/cmake-install.sh
114+
115+
ENV PATH=/usr/bin/cmake/bin:${PATH}
116+
112117
# Install ESP-IDF
113118
ENV IDF_PATH=/sources/esp-idf
114119
ENV ESP_PATCH_VER=esp-2021r2-patch5-8.4.0

‎.devcontainer/sources/Dockerfile.AzureRTOS‎

Lines changed: 11 additions & 6 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.24/cmake-3.24.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
@@ -57,6 +52,16 @@ RUN git clone --branch mbedtls-2.28.1 https://github.com/ARMmbed/mbedtls.git --d
5752
&& git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
5853
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
5954

55+
ARG CMAKE_VERSION=3.24.0
56+
RUN wget https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
57+
-q -O /tmp/cmake-install.sh \
58+
&& chmod u+x /tmp/cmake-install.sh \
59+
&& mkdir /usr/bin/cmake \
60+
&& /tmp/cmake-install.sh --skip-license --prefix=/usr/bin/cmake \
61+
&& rm /tmp/cmake-install.sh
62+
63+
ENV PATH=/usr/bin/cmake/bin:${PATH}
64+
6065
# set gcc location
6166
ENV ARM_GCC_PATH=/usr/local/bin/gcc
6267
ENV PATH=$ARM_GCC_PATH/bin:${PATH}

‎.devcontainer/sources/Dockerfile.ChibiOS‎

Lines changed: 11 additions & 6 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.24/cmake-3.24.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
@@ -57,6 +52,16 @@ RUN git clone --branch mbedtls-2.28.1 https://github.com/ARMmbed/mbedtls.git --d
5752
&& git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
5853
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
5954

55+
ARG CMAKE_VERSION=3.24.0
56+
RUN wget https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
57+
-q -O /tmp/cmake-install.sh \
58+
&& chmod u+x /tmp/cmake-install.sh \
59+
&& mkdir /usr/bin/cmake \
60+
&& /tmp/cmake-install.sh --skip-license --prefix=/usr/bin/cmake \
61+
&& rm /tmp/cmake-install.sh
62+
63+
ENV PATH=/usr/bin/cmake/bin:${PATH}
64+
6065
# set gcc location
6166
ENV ARM_GCC_PATH=/usr/local/bin/gcc
6267
ENV PATH=$ARM_GCC_PATH/bin:${PATH}

‎.devcontainer/sources/Dockerfile.ESP32‎

Lines changed: 11 additions & 6 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.24/cmake-3.24.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

@@ -52,6 +47,16 @@ RUN git clone --branch v4.4.3 https://github.com/espressif/esp-idf --depth 1 --r
5247
RUN ln -fs /usr/bin/python3 /usr/bin/python \
5348
&& pip3 install pyserial
5449

50+
ARG CMAKE_VERSION=3.24.0
51+
RUN wget https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
52+
-q -O /tmp/cmake-install.sh \
53+
&& chmod u+x /tmp/cmake-install.sh \
54+
&& mkdir /usr/bin/cmake \
55+
&& /tmp/cmake-install.sh --skip-license --prefix=/usr/bin/cmake \
56+
&& rm /tmp/cmake-install.sh
57+
58+
ENV PATH=/usr/bin/cmake/bin:${PATH}
59+
5560
# Install ESP-IDF
5661
ENV IDF_PATH=/sources/esp-idf
5762
ENV ESP_PATCH_VER=esp-2021r2-patch5-8.4.0

‎.devcontainer/sources/Dockerfile.TI‎

Lines changed: 11 additions & 6 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.24/cmake-3.24.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 \
@@ -57,6 +52,16 @@ RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC
5752
&& git clone --branch 1.10.0 https://github.com/nanoframework/TI_SysConfig.git --depth 1 ./sources/TI_SysConfig \
5853
&& chmod +x ./sources/TI_SysConfig/sysconfig_cli.sh
5954

55+
ARG CMAKE_VERSION=3.24.0
56+
RUN wget https://cmake.org/files/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
57+
-q -O /tmp/cmake-install.sh \
58+
&& chmod u+x /tmp/cmake-install.sh \
59+
&& mkdir /usr/bin/cmake \
60+
&& /tmp/cmake-install.sh --skip-license --prefix=/usr/bin/cmake \
61+
&& rm /tmp/cmake-install.sh
62+
63+
ENV PATH=/usr/bin/cmake/bin:${PATH}
64+
6065
# set gcc location
6166
ENV ARM_GCC_PATH=/usr/local/bin/gcc
6267
ENV PATH=$ARM_GCC_PATH/bin:${PATH}

0 commit comments

Comments
 (0)