Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Lantz <clantz@microsoft.com>2020-10-14 19:34:45 +0300
committerChuck Lantz <clantz@microsoft.com>2020-10-14 19:34:45 +0300
commitfbec07acdd86473f29c0813086af20b313cc3396 (patch)
tree3a740098586e9ab3c698eb52604050b9e3aca7d4 /.devcontainer
parent48d87785f8940687a545b776469c00e14dc71494 (diff)
Update devcontainer cache branch logic
Diffstat (limited to '.devcontainer')
-rwxr-xr-x.devcontainer/cache/build-cache-image.sh2
-rw-r--r--.devcontainer/devcontainer.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/.devcontainer/cache/build-cache-image.sh b/.devcontainer/cache/build-cache-image.sh
index fb2886a3075..78d0fbfdf0c 100755
--- a/.devcontainer/cache/build-cache-image.sh
+++ b/.devcontainer/cache/build-cache-image.sh
@@ -15,7 +15,7 @@ if [ "${CONTAINER_IMAGE_REPOSITORY}" = "" ]; then
exit 1
fi
-TAG="${BRANCH//\//-}"
+TAG="branch-${BRANCH//\//-}"
echo "[$(date)] ${BRANCH} => ${TAG}"
cd "${SCRIPT_PATH}/../.."
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 15715b06257..b32dd7f64e2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
"name": "Code - OSS",
// Image contents: https://github.com/microsoft/vscode-dev-containers/blob/master/repository-containers/images/github.com/microsoft/vscode/.devcontainer/base.Dockerfile
- "image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:master",
+ "image": "mcr.microsoft.com/vscode/devcontainers/repos/microsoft/vscode:branch-master",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/node/workspace/vscode,type=bind,consistency=cached",
"workspaceFolder": "/home/node/workspace/vscode",