Skip to content

Commit ccca695

Browse files
nfbotnfbot
authored
Release release-v1.6.5
 ***PUBLISH_RELEASE***
2 parents c8598d4 + 76da077 commit ccca695

File tree

303 files changed

+16986
-7687
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

303 files changed

+16986
-7687
lines changed

‎.devcontainer/Dockerfile.All‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FROM ghcr.io/nanoframework/dev-container-all:v1.3

‎.devcontainer/Dockerfile.AzureRTOS‎

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

‎.devcontainer/Dockerfile.ChibiOS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FROM ghcr.io/nanoframework/dev-container-chibios:v1.1

‎.devcontainer/Dockerfile.ESP32‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v1.2

‎.devcontainer/Dockerfile.TI‎

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

‎.devcontainer/README.md‎

4.26 KB

This folder contains all the elements used for .NET nanoFramework dev container

You'll find Docker files for .NET nanoFramework. They are used to facilitate building images.

The available pre build images are:

  • ghcr.io/nanoframework/dev-container-all: contains all elements to build any image. Important: the size of this container is very large, if you are interested only in building one of the image, you better need to une one of the following dedicated image
  • ghcr.io/nanoframework/dev-container-chibios: contains all elements to build any ESP32 image
  • ghcr.io/nanoframework/dev-container-ti: contains all elements to build any ESP32 image
  • ghcr.io/nanoframework/dev-container-esp32: contains all elements to build any ESP32 image
  • ghcr.io/nanoframework/dev-container-azure-rtos: contains all elements to build any Azure RTOS based image

To choose the dev container you want to use, adjust devcontainer.json and change the "dockerFile": "Dockerfile" elements for the image you'd liked to use:

  • Dockerfile.All to use the pre build container with all the elements to build all the images
  • Dockerfile.AzureRTOS to use the pre build container with all the elements to build Azure RTOS based devices
  • Dockerfile.ChibiOS to use the pre build container with all the elements to build ChibiOS based devices
  • Dockerfile.ESP32 to use the pre build container with all the elements to build ESP32 based devices
  • Dockerfile.TI to use the pre build container with all the elements to build TI based devices
  • ./sources/Dockerfile.All to use build the container from the source with all the elements to build all the images
  • ./sources/Dockerfile.AzureRTOS to use build the container from the source with all the elements to build Azure RTOS based devices
  • ./sources/Dockerfile.ChibiOS to use build the container from the source with all the elements to build ChibiOS based devices
  • ./sources/Dockerfile.ESP32 to use build the container from the source with all the elements to build ESP32 based devices
  • ./sources/Dockerfile.TI to use build the container from the source with all the elements to build TI based devices

‎.devcontainer/devcontainer.json‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
22
"name": "nanoFramework",
3-
"dockerFile": "Dockerfile",
3+
// Adjust this file to chose the platform you want using the prebuild containers
4+
// - Dockerfile.All = you can build anything but it's a very large container
5+
// - Dockerfile.AzureRTOS = for AzureRTOS targets
6+
// - Dockerfile.ChibiOS = for ChibiOS based targets (ex: STM32, Netduino, Orgpal)
7+
// - Dockerfile.ESP32 = for ESP32 targets
8+
// - Dockerfile.TI = for TI targets
9+
// If you prefer, you can use the source files and adjust them they are located, with the same names in ./sources. This will alow you to customize them and add anything you may need on top.
10+
"dockerFile": "Dockerfile.ChibiOS",
411
"context": ".",
512
"mounts": [
613
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
@@ -29,8 +36,8 @@
2936
"twxs.cmake",
3037
"ms-vscode.cmake-tools"
3138
],
32-
// Make sure we pull all the repos with the latest changes
33-
"postAttachCommand": "/usr/local/git-pull-repos.sh"
39+
// You can pull all the repos with the latest changes, this is only valid if you are using the ./sources/Dockerfile.all containers
40+
// "postAttachCommand": "/usr/local/git-pull-repos.sh"
3441
// Use 'forwardPorts' to make a list of ports inside the container available locally.
3542
// "forwardPorts": [],
3643
// Use 'postCreateCommand' to run commands after the container is created.

‎.devcontainer/scripts/git-pull-repos.sh‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@ cd /sources/STM32CubeH7
99
git pull origin nf-build
1010
cd /sources/AzureRTOS
1111
git pull
12-
cd /sources/ChibiOs
13-
git pull origin stable_20.3.x
12+
cd /
13+
rm -rf /sources/ChibiOs
14+
git svn clone https://svn.osdn.net/svnroot/chibios/branches/stable_21.6.x -rHEAD /sources/ChibiOs
1415
cd /sources/ChibiOs-Contrib
1516
git pull origin nanoframework
1617
cd /sources/mbedtls
17-
git pull origin mbedtls-2.23.0
18+
git pull origin mbedtls-2.26.0
1819
cd /sources/fatfs
1920
git pull origin R0.14
2021
cd /sources/FreeRTOS

‎.devcontainer/scripts/non-toot-user.sh‎ renamed to ‎.devcontainer/scripts/non-root-user.sh‎

File renamed without changes.

‎.devcontainer/Dockerfile‎ renamed to ‎.devcontainer/sources/Dockerfile.All‎

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,29 @@ RUN curl -o /tmp/dc-downloads/cmake.sh $CMAKE_SCRIPT \
1717
&& chmod +x /tmp/dc-downloads/cmake.sh \
1818
&& bash /tmp/dc-downloads/cmake.sh --skip-license --prefix=/tmp/dc-extracted/cmake
1919

20-
ARG IDF_URI=https://dl.espressif.com/dl/esp-idf/releases/esp-idf-v3.3.1.zip
20+
ARG IDF_URI=https://dl.espressif.com/dl/esp-idf/releases/esp-idf-v3.3.5.zip
2121
RUN curl -o /tmp/dc-downloads/esp-idf.zip $IDF_URI \
2222
&& unzip -d /tmp/dc-extracted/esp-idf /tmp/dc-downloads/esp-idf.zip
2323

24-
ARG IDF_LIBS_URI=https://dl.cloudsmith.io/public/net-nanoframework/internal-build-tools/raw/names/IDF_libs/versions/v3.3.1/IDF_libs-v3.3.1.zip
24+
ARG IDF_LIBS_URI=https://dl.cloudsmith.io/public/net-nanoframework/internal-build-tools/raw/names/IDF_libs/versions/v3.3.5/IDF_libs-v3.3.5.zip
2525
RUN curl -o /tmp/dc-downloads/esp-idf-libs.zip $IDF_LIBS_URI -L \
2626
&& unzip -d /tmp/dc-extracted/esp-idf-libs /tmp/dc-downloads/esp-idf-libs.zip
2727

28-
ARG XTENSA_URI=https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz
28+
ARG IDF_LIBS_URI=https://dl.cloudsmith.io/public/net-nanoframework/internal-build-tools/raw/names/IDF_libs/versions/v3.3.5_BLE/IDF_libs-v3.3.5_BLE.zip
29+
RUN curl -o /tmp/dc-downloads/esp-idf-libs-ble.zip $IDF_LIBS_URI -L \
30+
&& unzip -d /tmp/dc-extracted/esp-idf-libs_BLE /tmp/dc-downloads/esp-idf-libs-ble.zip
31+
32+
ARG IDF_LIBS_URI=https://dl.cloudsmith.io/public/net-nanoframework/internal-build-tools/raw/names/IDF_libs/versions/v3.3.5_V3/IDF_libs-v3.3.5_V3.zip
33+
RUN curl -o /tmp/dc-downloads/esp-idf-libs-v3.zip $IDF_LIBS_URI -L \
34+
&& unzip -d /tmp/dc-extracted/esp-idf-libs_V3 /tmp/dc-downloads/esp-idf-libs-v3.zip
35+
36+
ARG XTENSA_URI=https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-97-gc752ad5-5.2.0.tar.gz
2937
RUN mkdir -p /tmp/dc-extracted/xtensa \
3038
&& curl -o /tmp/dc-downloads/xtensa.tar.gz $XTENSA_URI \
3139
&& tar -xzf /tmp/dc-downloads/xtensa.tar.gz -C /tmp/dc-extracted/xtensa --strip-components 1
3240

33-
ARG TI_TOOL_URL=http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/3_61_00_16/exports/xdccore/xdctools_3_61_00_16_core_linux.zip
41+
# 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
42+
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
3443
RUN mkdir -p /tmp/dc-extracted/titools \
3544
&& curl -o /tmp/dc-downloads/titools.zip $TI_TOOL_URL -L \
3645
&& unzip -d /tmp/dc-extracted/titools /tmp/dc-downloads/titools.zip
@@ -50,6 +59,8 @@ RUN apt-get update \
5059
&& apt-get -y install --no-install-recommends apt-utils dialog icu-devtools 2>&1 \
5160
&& apt-get install -y \
5261
git \
62+
git-lfs \
63+
git-svn \
5364
curl \
5465
ninja-build \
5566
srecord \
@@ -63,36 +74,39 @@ RUN mkdir -p /usr/local/bin/gcc \
6374
&& mkdir -p /usr/local/bin/titools
6475

6576
# Clone repos for STM32 including AzureRTOS
66-
RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git ./sources/STM32CubeL4 \
67-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git ./sources/STM32CubeF7 \
68-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git ./sources/STM32CubeF4 \
69-
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git ./sources/STM32CubeH7 \
70-
&& git clone --recursive https://github.com/azure-rtos/threadx.git ./sources/AzureRTOS \
71-
&& git clone --branch stable_20.3.x https://github.com/nanoframework/chibios.git ./sources/ChibiOs \
72-
&& git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git ./sources/ChibiOs-Contrib
77+
RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
78+
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
79+
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
80+
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
81+
&& git clone --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
82+
&& git svn clone https://svn.osdn.net/svnroot/chibios/branches/stable_21.6.x -rHEAD ./sources/ChibiOs \
83+
&& git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
7384
# Clone mbedtls and fatfs
74-
RUN git clone --branch mbedtls-2.23.0 https://github.com/nanoframework/mbedtls.git ./sources/mbedtls \
75-
&& git clone --branch R0.14 https://github.com/abbrev/fatfs.git ./sources/fatfs
85+
RUN git clone --branch mbedtls-2.26.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
86+
&& git clone --branch R0.14 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
7687
# Clone FreeRTOS and what is needed for ESP32
77-
RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git ./sources/FreeRTOS \
78-
&& git clone --branch 5.5.1 https://github.com/ARM-software/CMSIS_5.git ./sources/CMSIS_5 \
79-
&& git clone --branch STABLE-2_0_3_RELEASE https://git.savannah.nongnu.org/git/lwip.git ./sources/lwip \
80-
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git ./sources/spiffs
88+
RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \
89+
&& git clone --branch 5.5.1 https://github.com/ARM-software/CMSIS_5.git --depth 1 ./sources/CMSIS_5 \
90+
&& git clone --branch STABLE-2_0_3_RELEASE https://git.savannah.nongnu.org/git/lwip.git --depth 1 ./sources/lwip \
91+
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
8192
# Clone what is needed for TI
82-
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git ./sources/SimpleLinkCC32 \
83-
# && git clone --branch 3.61.00.16 https://github.com/nanoframework/TI_XDCTools.git ./sources/TI_XDCTools \
84-
&& git clone --branch 4.20.01.04 https://github.com/nanoframework/SimpleLink_CC13x2_26x2_SDK.git ./sources/SimpleLinkCC13 \
85-
&& git clone --branch 1.5.0 https://github.com/nanoframework/TI_SysConfig.git ./sources/TI_SysConfig \
93+
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \
94+
# you can't use the nanoFramework repository as it's Windows only
95+
# && git clone --branch 3.61.00.16 https://github.com/nanoframework/TI_XDCTools.git --depth 1 ./sources/TI_XDCTools \
96+
&& git clone --branch 5.10.00.48 https://github.com/nanoframework/SimpleLink_CC13x2_26x2_SDK.git --depth 1 ./sources/SimpleLinkCC13 \
97+
&& git clone --branch 1.8.1 https://github.com/nanoframework/TI_SysConfig.git --depth 1 ./sources/TI_SysConfig \
8698
&& chmod +x ./sources/TI_SysConfig/sysconfig_cli.sh
8799

88100
# Copy from our other container
89101
COPY --from=downloader /tmp/dc-extracted/gcc /usr/local/bin/gcc
90102
COPY --from=downloader /tmp/dc-extracted/cmake /usr
91103
COPY --from=downloader /tmp/dc-extracted/esp-idf /sources/esp-idf
104+
COPY --from=downloader /tmp/dc-extracted/esp-idf-libs_BLE /sources/esp-idf-libs_BLE
105+
COPY --from=downloader /tmp/dc-extracted/esp-idf-libs_V3 /sources/esp-idf-libs_V3
92106
COPY --from=downloader /tmp/dc-extracted/esp-idf-libs /sources/esp-idf-libs
93107
COPY --from=downloader /tmp/dc-extracted/xtensa /usr/local/bin/xtensa
94-
COPY --from=downloader /tmp/dc-extracted/titools/xdctools_3_61_00_16_core /usr/local/bin/titools
95-
COPY ./scripts/git-pull-repos.sh /usr/local/git-pull-repos.sh
108+
COPY --from=downloader /tmp/dc-extracted/titools/xdctools_3_62_00_08_core /usr/local/bin/titools
109+
# COPY ./scripts/git-pull-repos.sh /usr/local/git-pull-repos.sh
96110

97111
# Putting hex2dfu in the container
98112
ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v2.0.9/hex2dfu

0 commit comments

Comments
 (0)