Skip to content

Commit 937d3e1

Browse files
Niall Coolinggeekbozu
authored andcommitted
added dos2unix to docker for Win10 and default to release build
1 parent 382db66 commit 937d3e1

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

.devcontainer/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN apt-get update -qq \
1515
unzip \
1616
wget \
1717
curl \
18+
dos2unix \
1819
# aarch64 packages
1920
libffi-dev \
2021
libssl-dev \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22
rm -rf build/
3-
cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Debug -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild
3+
cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild

.devcontainer/devcontainer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717

1818
// Add the IDs of extensions you want installed when the container is created.
1919
"extensions": [
20-
"ms-vscode.cpptools"
20+
"ms-vscode.cpptools",
21+
"ms-vscode.cmake-tools",
2122
],
2223

2324
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2425
// "forwardPorts": [],
2526

2627
// Use 'postCreateCommand' to run commands after the container is created.
27-
// "postCreateCommand": "/opt/create_build_openocd.sh",
28+
// "postCreateCommand": "bash /opt/create_build_openocd.sh",
2829

2930
// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
3031
// "remoteUser": "vscode"

0 commit comments

Comments
 (0)