Skip to content

Commit 57824c7

Browse files
committed
Merge branch 'main' into 8-change-asyncrequeststatus-to-a-type
conflicts: - Dockerfile: accept all current - .vscode/settings.json: accept all incoming and update to include docker file ignore for file header
2 parents 97b270a + 2798bfc commit 57824c7

File tree

6 files changed

+983
-13880
lines changed

6 files changed

+983
-13880
lines changed

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"esbenp.prettier-vscode",
66
"psioniq.psi-header",
77
"dbaeumer.vscode-eslint",
8-
"ms-vsliveshare.vsliveshare"
8+
"ms-vsliveshare.vsliveshare",
9+
"davidanson.vscode-markdownlint"
910
]
1011
}

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"**/sonar-project.properties",
2727
"**/.github/**/*",
2828
"**/*.yml",
29-
"**/.prettierignore"
29+
"**/.prettierignore",
30+
"**/Dockerfile"
3031
],
3132
"exclude": ["jsonc", "json", "markdown"]
3233
},

.whitesource

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
{
2-
"scanSettings": {
3-
"baseBranches": []
4-
},
52
"checkRunSettings": {
6-
"vulnerableCheckRunConclusionLevel": "failure",
7-
"displayMode": "diff"
3+
"vulnerableCheckRunConclusionLevel": "failure"
84
},
95
"issueSettings": {
10-
"minSeverityLevel": "LOW",
11-
"issueType": "DEPENDENCY"
6+
"minSeverityLevel": "LOW"
127
}
138
}

Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
/*
2+
* Copyright 2023 MFB Technologies, Inc.
3+
*/
4+
15
FROM debian:bullseye
26
ARG USERNAME=vscode
37
RUN apt-get update
@@ -31,4 +35,4 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | b
3135
RUN --mount=type=ssh,uid=1002 git clone [email protected]:MFB-Technologies-Inc/react-async-renderer /home/$USERNAME/workspace/react-async-renderer
3236
# set working dir
3337
WORKDIR /home/$USERNAME/workspace/react-async-renderer
34-
VOLUME /home/$USERNAME/workspace/react-async-renderer
38+
VOLUME /home/$USERNAME/workspace/react-async-renderer

0 commit comments

Comments
 (0)