Skip to content

Commit 2e99008

Browse files
aromaaaromaa
committed
Merge branch 'main' into feature/device-public-key
2 parents 7562718 + b9444f2 commit 2e99008

File tree

667 files changed

+50825
-9819
lines changed

Some content is hidden

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

667 files changed

+50825
-9819
lines changed

‎.devcontainer/Dockerfile.All

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-all:v2.29
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.37

‎.devcontainer/Dockerfile.AzureRTOS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.16
1+
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.21

‎.devcontainer/Dockerfile.ChibiOS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-chibios:v1.16
1+
FROM ghcr.io/nanoframework/dev-container-chibios:v1.21

‎.devcontainer/Dockerfile.ESP32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-esp32:v2.24
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v2.26

‎.devcontainer/Dockerfile.TI

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-ti:v1.16
1+
FROM ghcr.io/nanoframework/dev-container-ti:v1.18

‎.devcontainer/README.md

+8
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,11 @@ To choose the dev container you want to use, adjust `devcontainer.json` and chan
2222
* `./sources/Dockerfile.ChibiOS` to build the container image from the source with all the elements to build ChibiOS based devices
2323
* `./sources/Dockerfile.ESP32` to build the container image from the source with all the elements to build ESP32 based devices
2424
* `./sources/Dockerfile.TI` to build the container image from the source with all the elements to build TI SimpleLink based devices
25+
26+
27+
## Building and releasing Docker images in a fork
28+
29+
Add a "repository variable" called `PUBLISH_DOCKER_IMAGE` with the value `true` in your forked repository
30+
See: https://docs.github.com/en/actions/learn-github-actions/variables#creating-configuration-variables-for-a-repository for further help.
31+
32+
**Note:** by default, the build and publish of the devcontainer docker images will still only happen when the docker source files change and are "pushed" to the `main` branch.

‎.devcontainer/devcontainer.json

+34-27
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,54 @@
11
{
22
"name": "nanoFramework",
3-
// Adjust this file to chose the platform you want using the prebuild containers
3+
// Adjust this file to choose the platform you want using the prebuild containers:
44
// - Dockerfile.All = you can build anything but it's a very large container
55
// - Dockerfile.AzureRTOS = for AzureRTOS targets
66
// - Dockerfile.ChibiOS = for ChibiOS based targets (ex: STM32, Netduino, Orgpal)
77
// - Dockerfile.ESP32 = for ESP32 targets
88
// - 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.ALL",
9+
// If you prefer, you can use the source files and adjust them where they are located,
10+
// To do this, prefix 'sources'. e.g. 'sources/Dockerfile.All'.
11+
// This will allow you to customize and build the container source and add anything you may need on top.
12+
"dockerFile": "Dockerfile.All",
1113
"context": ".",
1214
"mounts": [
15+
// Bind the Unix socket the Docker daemon listens on by default
1316
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
14-
// Mount .azure folder for seamless az cli auth
15-
"source=${env:HOME}${env:USERPROFILE}/.azure,target=/home/vscode/.azure,type=bind",
1617
// Keep command history
1718
"source=nano-bashhistory,target=/home/vscode/commandhistory,type=volume",
19+
// OPTIONAL: Mount .azure folder for seamless az cli auth
20+
// "source=${env:HOME}${env:USERPROFILE}/.azure,target=/home/vscode/.azure,type=bind"
1821
],
19-
// Set *default* container specific settings.json values on container create.
20-
"settings": {
21-
"cmake.preferredGenerators": [
22-
"Ninja"
23-
],
24-
"cmake.generator": "Ninja",
25-
"cmake.autoRestartBuild" : true,
26-
"cmake.configureSettings": {
27-
"CMAKE_MAKE_PROGRAM":"/usr/bin/ninja"
28-
},
29-
"cmake.configureOnOpen": false
30-
},
31-
// Add the IDs of extensions you want installed when the container is created.
32-
"extensions": [
33-
"ms-vsliveshare.vsliveshare-pack",
34-
"streetsidesoftware.code-spell-checker",
35-
"twxs.cmake",
36-
"ms-vscode.cmake-tools",
37-
"xaver.clang-format"
38-
],
39-
// You can pull all the repos with the latest changes, this is only valid if you are using the ./sources/Dockerfile.all containers
22+
// Set the *default* container specific settings.json values on container create.
23+
"customizations": {
24+
"vscode": {
25+
"settings": {
26+
"cmake.preferredGenerators": [
27+
"Ninja"
28+
],
29+
"cmake.generator": "Ninja",
30+
"cmake.autoRestartBuild" : true,
31+
"cmake.configureSettings": {
32+
"CMAKE_MAKE_PROGRAM":"/usr/bin/ninja"
33+
},
34+
"cmake.configureOnOpen": false
35+
},
36+
// Add the IDs of extensions you want installed when the container is created.
37+
"extensions": [
38+
"ms-vsliveshare.vsliveshare-pack",
39+
"streetsidesoftware.code-spell-checker",
40+
"twxs.cmake",
41+
"ms-vscode.cmake-tools",
42+
"xaver.clang-format"
43+
]
44+
}
45+
}
46+
// You can pull all the repos with the latest changes, this is only valid if you are using the ./sources/Dockerfile.All containers
4047
// "postAttachCommand": "/usr/local/git-pull-repos.sh"
4148
// Use 'forwardPorts' to make a list of ports inside the container available locally.
4249
// "forwardPorts": [],
4350
// Use 'postCreateCommand' to run commands after the container is created.
4451
// "postCreateCommand": "terraform --version",
4552
// Uncomment to connect as a non-root user. See https: //aka.ms/vscode-remote/containers/non-root.
4653
// ,"remoteUser": "vscode"
47-
}
54+
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ cd /sources/AzureRTOS
1111
git pull
1212
cd /
1313
rm -rf /sources/ChibiOs
14-
git svn clone https://svn.osdn.net/svnroot/chibios/branches/stable_21.11.x -rHEAD /sources/ChibiOs
14+
git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD /sources/ChibiOs
1515
cd /sources/ChibiOs-Contrib
1616
git pull origin nanoframework
1717
cd /sources/mbedtls
18-
git pull origin mbedtls-2.28.1
18+
git pull origin mbedtls-2.28.2
1919
cd /sources/fatfs
2020
git pull origin R0.14b
2121
cd /sources/FreeRTOS

‎.devcontainer/sources/Dockerfile.All

+23-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxcontainers/debian-slim:latest AS downloader
1+
FROM ubuntu:latest AS downloader
22
RUN apt-get update \
33
&& apt-get -y install --no-install-recommends apt-utils \
44
&& apt-get install -y \
@@ -7,28 +7,28 @@ RUN apt-get update \
77
unzip \
88
wget
99

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

17-
# 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
18-
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
17+
# This is TI XDC tools for linux. Cheack all versions here: https://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/index.html
18+
ARG TI_TOOL_URL=https://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
1919
RUN mkdir -p /tmp/dc-extracted/titools \
2020
&& curl -o /tmp/dc-downloads/titools.zip $TI_TOOL_URL -L \
2121
&& unzip -d /tmp/dc-extracted/titools /tmp/dc-downloads/titools.zip
2222

23-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.sh
23+
ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh
2424
RUN wget $CMAKE_SCRIPT \
2525
-q -O /tmp/cmake-install.sh \
2626
&& chmod u+x /tmp/cmake-install.sh \
2727
&& mkdir /tmp/dc-extracted/cmake \
2828
&& /tmp/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
2929
&& rm /tmp/cmake-install.sh
3030

31-
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
31+
FROM ubuntu:latest AS devcontainer
3232

3333
# Avoid warnings by switching to noninteractive
3434
ENV DEBIAN_FRONTEND=noninteractive
@@ -50,11 +50,16 @@ RUN apt-get update \
5050
curl \
5151
ninja-build \
5252
srecord \
53-
python3 \
54-
python3-pip \
5553
nodejs \
5654
libffi-dev
5755

56+
# Set Python 10 as the default version
57+
RUN apt-get install -y software-properties-common \
58+
&& add-apt-repository ppa:deadsnakes/ppa \
59+
&& apt-get update \
60+
&& apt-get install -y python3.10 \
61+
python3-pip
62+
5863
# Create needed directories
5964
RUN mkdir -p /usr/local/bin/gcc \
6065
&& mkdir -p /usr/local/bin/titools
@@ -64,12 +69,12 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
6469
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
6570
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
6671
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
67-
&& git clone --branch v6.1.12_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
68-
&& git clone --branch v6.1.12_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NextDuo \
69-
&& git svn clone https://svn.osdn.net/svnroot/chibios/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
72+
&& git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
73+
&& git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo \
74+
&& git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
7075
&& git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
7176
# Clone mbedtls and fatfs
72-
RUN git clone --branch mbedtls-2.28.1 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
77+
RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
7378
&& git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
7479
# Clone FreeRTOS and what is needed for ESP32
7580
RUN git clone --branch V10.4.1-kernel-only https://github.com/FreeRTOS/FreeRTOS-Kernel.git --depth 1 ./sources/FreeRTOS \
@@ -82,7 +87,7 @@ RUN git clone --branch STABLE-2_0_3_RELEASE https://git.savannah.nongnu.org/git/
8287
ENV GIT_SSL_NO_VERIFY=0
8388

8489
# Clone ESP-IDF
85-
RUN git clone --branch v4.4.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
90+
RUN git clone --branch v4.4.5 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf
8691

8792
# Clone what is needed for TI
8893
RUN git clone --branch 4.10.00.07 https://github.com/nanoframework/SimpleLink_CC32xx_SDK.git --depth 1 ./sources/SimpleLinkCC32 \
@@ -106,7 +111,7 @@ ENV PATH=/usr/bin/cmake/bin:${PATH}
106111
# Putting hex2dfu in the container
107112
ENV HEX2DFU_PATH=/usr/local/bin/hex2dfu
108113

109-
ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v2.0.9/hex2dfu
114+
ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v3.0.2/hex2dfu
110115
RUN mkdir -p $HEX2DFU_PATH \
111116
&& curl -o $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
112117
&& chmod +x $HEX2DFU_PATH/hex2dfu
@@ -118,17 +123,19 @@ RUN ln -fs /usr/bin/python3 /usr/bin/python \
118123
# Install ESP-IDF
119124
ENV IDF_PATH=/sources/esp-idf
120125
ENV ESP_PATCH_VER=esp-2021r2-patch5-8.4.0
121-
RUN python -m pip install -r $IDF_PATH/requirements.txt
126+
# This is now taking care in the following line
127+
# RUN python -m pip install -r $IDF_PATH/requirements.txt
122128
RUN $IDF_PATH/install.sh
123129

124-
ENV PATH=$PATH:\
130+
ENV PATH=/root/.espressif/python_env/idf4.4_py3.10_env/bin:$PATH:\
125131
$IDF_PATH/components/esptool_py/esptool:\
126132
$IDF_PATH/components/espcoredump:\
127133
$IDF_PATH/components/partition_table/:\
128134
$IDF_PATH/tools/:\
129135
$IDF_PATH/components/app_update:\
130136
/root/.espressif/tools/xtensa-esp32-elf/$ESP_PATCH_VER/xtensa-esp32-elf/bin:\
131137
/root/.espressif/tools/xtensa-esp32s2-elf/$ESP_PATCH_VER/xtensa-esp32s2-elf/bin:\
138+
/root/.espressif/tools/xtensa-esp32s3-elf/$ESP_PATCH_VER/xtensa-esp32s3-elf/bin:\
132139
/root/.espressif/tools/riscv32-esp-elf/$ESP_PATCH_VER/riscv32-esp-elf/bin
133140

134141
# Clean up downloaded files

‎.devcontainer/sources/Dockerfile.AzureRTOS

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/linuxcontainers/debian-slim:latest AS downloader
1+
FROM ubuntu:latest AS downloader
22
RUN apt-get update \
33
&& apt-get -y install --no-install-recommends apt-utils \
44
&& apt-get install -y \
@@ -7,22 +7,22 @@ RUN apt-get update \
77
unzip \
88
wget
99

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

17-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.sh
17+
ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh
1818
RUN wget $CMAKE_SCRIPT \
1919
-q -O /tmp/cmake-install.sh \
2020
&& chmod u+x /tmp/cmake-install.sh \
2121
&& mkdir /tmp/dc-extracted/cmake \
2222
&& /tmp/cmake-install.sh --skip-license --prefix=/tmp/dc-extracted/cmake \
2323
&& rm /tmp/cmake-install.sh
2424

25-
FROM ghcr.io/linuxcontainers/debian-slim:latest AS devcontainer
25+
FROM ubuntu:latest AS devcontainer
2626

2727
# Avoid warnings by switching to noninteractive
2828
ENV DEBIAN_FRONTEND=noninteractive
@@ -45,19 +45,19 @@ RUN apt-get update \
4545
srecord
4646

4747
# Create needed directories
48-
RUN mkdir -p /usr/local/bin/gcc \
49-
&& mkdir -p /usr/local/bin/xtensa
48+
RUN mkdir -p /usr/local/bin/gcc
5049

5150
# Clone repos for STM32 including AzureRTOS
52-
RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
51+
RUN git svn clone http://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
52+
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git --depth 1 ./sources/STM32CubeL4 \
5353
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
5454
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
5555
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
56-
&& git svn clone https://svn.osdn.net/svnroot/chibios/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
57-
&& git clone --branch v6.1.12_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
58-
&& git clone --branch v6.1.12_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NextDuo
56+
&& git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
57+
&& git clone --branch v6.2.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
58+
5959
# Clone mbedtls and fatfs
60-
RUN git clone --branch mbedtls-2.28.1 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
60+
RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
6161
&& git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
6262
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
6363

@@ -74,7 +74,7 @@ ENV PATH=/usr/bin/cmake/bin:${PATH}
7474
# Putting hex2dfu in the container
7575
ENV HEX2DFU_PATH=/usr/local/bin/hex2dfu
7676

77-
ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v2.0.9/hex2dfu
77+
ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v3.0.2/hex2dfu
7878
RUN mkdir -p $HEX2DFU_PATH \
7979
&& curl -o $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
8080
&& chmod +x $HEX2DFU_PATH/hex2dfu

‎.devcontainer/sources/Dockerfile.ChibiOS

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ RUN apt-get update \
77
unzip \
88
wget
99

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

17-
ARG CMAKE_SCRIPT=https://cmake.org/files/v3.24/cmake-3.24.0-linux-x86_64.sh
17+
ARG CMAKE_SCRIPT=https://github.com/Kitware/CMake/releases/download/v3.27.6/cmake-3.27.6-linux-x86_64.sh
1818
RUN wget $CMAKE_SCRIPT \
1919
-q -O /tmp/cmake-install.sh \
2020
&& chmod u+x /tmp/cmake-install.sh \
@@ -54,10 +54,10 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
5454
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF7.git --depth 1 ./sources/STM32CubeF7 \
5555
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeF4.git --depth 1 ./sources/STM32CubeF4 \
5656
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7 \
57-
&& git svn clone https://svn.osdn.net/svnroot/chibios/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
57+
&& git svn clone https://svn.code.sf.net/p/chibios/code/branches/stable_21.11.x -rHEAD ./sources/ChibiOs \
5858
&& git clone --branch nanoframework https://github.com/nanoframework/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
5959
# Clone mbedtls and fatfs
60-
RUN git clone --branch mbedtls-2.28.1 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
60+
RUN git clone --branch mbedtls-2.28.2 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
6161
&& git clone --branch R0.14b https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
6262
&& git clone --branch nf-build https://github.com/nanoframework/spiffs.git --depth 1 ./sources/spiffs
6363

@@ -74,7 +74,7 @@ ENV PATH=/usr/bin/cmake/bin:${PATH}
7474
# Putting hex2dfu in the container
7575
ENV HEX2DFU_PATH=/usr/local/bin/hex2dfu
7676

77-
ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v2.0.9/hex2dfu
77+
ARG HEX2DFU=https://github.com/nanoframework/hex2dfu/releases/download/v3.0.2/hex2dfu
7878
RUN mkdir -p $HEX2DFU_PATH \
7979
&& curl -o $HEX2DFU_PATH/hex2dfu $HEX2DFU -L \
8080
&& chmod +x $HEX2DFU_PATH/hex2dfu

0 commit comments

Comments
 (0)