Skip to content

Commit 0a9545e

Browse files
authoredApr 21, 2020
Bringing the tree up to formatting parity with clang-format, shellcheck, shfmt, yaml linting, and MD lint (project-chip#432)
* Initial restyle * Updating json and pretty * Adding editorconfig * Forcing us to use common pretty-ify versions * Manually moving this up, fixing more pinning * restyle devcontainer * Pulling upstream * Keeping travis off restyled * Testing fix for codecov
1 parent b3cd438 commit 0a9545e

File tree

140 files changed

+3907
-3652
lines changed

Some content is hidden

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

140 files changed

+3907
-3652
lines changed
 

‎.devcontainer/Dockerfile

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ RUN apt-get -fy install git vim emacs sudo \
1818
iproute2 procps lsb-release \
1919
bash-completion \
2020
build-essential cmake cppcheck valgrind \
21-
wget curl telnet bsdtar
21+
wget curl telnet bsdtar \
22+
docker.io
2223
RUN groupadd --gid $USER_GID $USERNAME
2324
RUN useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME
2425
RUN echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME
@@ -31,4 +32,9 @@ RUN cd /var/downloads
3132
RUN curl -JL https://github.com/microsoft/vscode-cpptools/releases/download/0.27.0/cpptools-linux.vsix | bsdtar -xvf - extension
3233
RUN mkdir -p /home/vscode/.vscode-server/extensions
3334
RUN mv extension /home/vscode/.vscode-server/extensions/ms-vscode.cpptools-0.27.0
35+
RUN mkdir -p /home/vscode/bin
36+
RUN curl https://raw.githubusercontent.com/restyled-io/restyler/master/bin/restyle-path -o /home/vscode/bin/restyle-path
37+
RUN chmod +x /home/vscode/bin/restyle-path
3438
RUN chown -R vscode:vscode /home/vscode
39+
40+

‎.devcontainer/devcontainer.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
{
22
"name": "CHIP Ubuntu Development Environment",
3+
"runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
34
"build": {
45
"dockerfile": "Dockerfile",
56
"args": {
67
// "BUILD_VERSION": "$(cat integrations/docker/images/chip-build/version)" // trying to get this to work
78
"BUILD_VERSION": "0.2.7"
89
}
910
},
10-
"runArgs": [
11-
"--cap-add=SYS_PTRACE",
12-
"--security-opt",
13-
"seccomp=unconfined"
14-
],
1511
"remoteUser": "vscode",
1612
// Add the IDs of extensions you want installed when the container is created in the array below.
1713
"extensions": [
@@ -23,9 +19,11 @@
2319
"eamodio.gitlens",
2420
"yuichinukiyama.vscode-preview-server",
2521
"aaron-bond.better-comments",
26-
"foxundermoon.shell-format"
22+
"foxundermoon.shell-format",
23+
"editorconfig.editorconfig",
24+
"esbenp.prettier-vscode"
2725
],
28-
// Use 'settings' to set *default* container specific settings.json values on container create.
26+
// Use 'settings' to set *default* container specific settings.json values on container create.
2927
// You can edit these settings after create using File > Preferences > Settings > Remote.
3028
"settings": {
3129
"terminal.integrated.shell.linux": "/bin/bash"

0 commit comments

Comments
 (0)
Please sign in to comment.