Skip to content

Commit a513acd

Browse files
authored
Fix CMake install in dev containers (#2476)
***NO_CI***
1 parent 3ed5f35 commit a513acd

File tree

10 files changed

+35
-10
lines changed

10 files changed

+35
-10
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.25
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.26

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

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

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

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

.devcontainer/sources/Dockerfile.All

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@ 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 \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
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+
1621
# 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
1722
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
1823
RUN mkdir -p /tmp/dc-extracted/titools \

.devcontainer/sources/Dockerfile.AzureRTOS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@ 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 \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
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+
1621
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
1722

1823
# Avoid warnings by switching to noninteractive

.devcontainer/sources/Dockerfile.ChibiOS

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@ 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 \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
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+
1621
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
1722

1823
# Avoid warnings by switching to noninteractive

.devcontainer/sources/Dockerfile.ESP32

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

9-
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc
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
1015

1116
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
1217

.devcontainer/sources/Dockerfile.TI

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,17 @@ 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 \
10+
RUN mkdir -p /tmp/dc-downloads /tmp/dc-extracted/gcc /tmp/dc-extracted/cmake \
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+
1621
# 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
1722
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
1823
RUN mkdir -p /tmp/dc-extracted/titools \

0 commit comments

Comments
 (0)