mirror of
https://github.com/JamesIves/github-pages-deploy-action.git
synced 2023-12-15 20:03:39 +08:00
14
This commit is contained in:
parent
c9ee890462
commit
56ff5960ed
@ -1,2 +1,2 @@
|
|||||||
ARG VARIANT=12
|
ARG VARIANT=14
|
||||||
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}
|
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}
|
@ -1,4 +1,4 @@
|
|||||||
ARG VARIANT=12-buster
|
ARG VARIANT=14-buster
|
||||||
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}
|
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}
|
||||||
|
|
||||||
# Install tslint, typescript. eslint is installed by javascript image
|
# Install tslint, typescript. eslint is installed by javascript image
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
|
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
|
||||||
{
|
{
|
||||||
|
<<<<<<< Updated upstream
|
||||||
"name": "Node.js & TypeScript",
|
"name": "Node.js & TypeScript",
|
||||||
"build": {
|
"build": {
|
||||||
"dockerfile": "Dockerfile",
|
"dockerfile": "Dockerfile",
|
||||||
@ -13,3 +14,20 @@
|
|||||||
"extensions": ["dbaeumer.vscode-eslint"],
|
"extensions": ["dbaeumer.vscode-eslint"],
|
||||||
"remoteUser": "node"
|
"remoteUser": "node"
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
"name": "Node.js & TypeScript",
|
||||||
|
"build": {
|
||||||
|
"dockerfile": "Dockerfile",
|
||||||
|
"args": {
|
||||||
|
"VARIANT": "14"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"settings": {
|
||||||
|
"terminal.integrated.shell.linux": "/bin/bash"
|
||||||
|
},
|
||||||
|
"extensions": [
|
||||||
|
"dbaeumer.vscode-eslint"
|
||||||
|
],
|
||||||
|
"remoteUser": "node"
|
||||||
|
}
|
||||||
|
>>>>>>> Stashed changes
|
||||||
|
Loading…
Reference in New Issue
Block a user