diff options
| author | BloodStainedCrow <tim.aschhoff@t-online.de> | 2024-03-23 10:45:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-23 10:45:45 +0100 |
| commit | 57e625d4dcb94c4d26a3a65e6738322f172b705b (patch) | |
| tree | 5a0f39f39fc8dc3f617fe8dec16b7e478de6e1ca /docker | |
| parent | 9a5f516c427f329bbc161f794bae18908fcd33c5 (diff) | |
Unify docker devcontainer with dockerfile used for CI (#1587)
* Only use one Dockerfile and build.sh script for both docker and devcontainer
* Remove all now unneccessary tasks and scripts
* Update to clang-format-14
* Move devcontainer.json into root folder
* Fix conditional statements in Dockerfile
* Move .devcontainer/README into doc/usingDevcontainers
* Remove obsolete VSCode Task
* Change standard compiler path to the correct compiler
* Set GDB Path for debugging
* Hide broken buttons from CMake Extension
* Refactor .devcontainer
* Remove unneccessary postBuildCommand
* Add devcontainer dependencies to all docker images
* Add Devcontainer Debug launch config
* Add an additional c_cpp_properties config as a fallback for devcontainer
* Remove obsolete Docker Argument
* Fix wrong C/Cpp versions
* Fix silent fail of gdb, add libncurses5
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 22bf7bd7..bb5d5f65 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -37,6 +37,13 @@ RUN apt-get update -qq \ libpangocairo-1.0-0 \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/*; +# Add the necessary apt-gets for the devcontainer +RUN apt-get update -qq \ + && apt-get install -y \ + clang-format-14 \ + clang-tidy \ + libncurses5 + # Git needed for PROJECT_GIT_COMMIT_HASH variable setting RUN pip3 install adafruit-nrfutil @@ -55,5 +62,8 @@ RUN bash -c "source /opt/build.sh; GetNrfSdk;" # McuBoot RUN bash -c "source /opt/build.sh; GetMcuBoot;" +# Add the infinitime user for connecting devcontainer +RUN adduser infinitime + ENV SOURCES_DIR /sources CMD ["/opt/build.sh"] |