Skip to content

Commit da0abc3

Browse files
committed
fix: devctaonier cd
1 parent a3000e5 commit da0abc3

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

.azuredevops/templates/run-devcontainer.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,23 +28,28 @@ steps:
2828
docker ps -aq --filter "label=devcontainer.config_file=\"$(pwd)/${{ parameters.configPath }}\"" | xargs -r docker rm -f 2>/dev/null || true
2929
docker ps -aq --filter "label=devcontainer.local_folder=\"$(pwd)\"" | xargs -r docker rm -f 2>/dev/null || true
3030
31+
WORKSPACE_FOLDER="$(pwd)"
32+
3133
devcontainer up \
32-
--workspace-folder "$(pwd)" \
34+
--workspace-folder "$WORKSPACE_FOLDER" \
3335
--config "${{ parameters.configPath }}" \
3436
--docker-path "$DOCKER_PATH"
3537
38+
cd "$WORKSPACE_FOLDER"
3639
devcontainer exec \
37-
--workspace-folder "$(pwd)" \
40+
--workspace-folder "$WORKSPACE_FOLDER" \
3841
--config "${{ parameters.configPath }}" \
3942
--docker-path "$DOCKER_PATH" \
4043
bash -c '${{ parameters.command }}'
4144
else
4245
# Remove any existing container to ensure clean state on Linux
43-
docker ps -aq --filter "label=devcontainer.config_file=\"$(pwd)/${{ parameters.configPath }}\"" | xargs -r docker rm -f 2>/dev/null || true
44-
docker ps -aq --filter "label=devcontainer.local_folder=\"$(pwd)\"" | xargs -r docker rm -f 2>/dev/null || true
46+
WORKSPACE_FOLDER="$(pwd)"
47+
docker ps -aq --filter "label=devcontainer.config_file=\"$WORKSPACE_FOLDER/${{ parameters.configPath }}\"" | xargs -r docker rm -f 2>/dev/null || true
48+
docker ps -aq --filter "label=devcontainer.local_folder=\"$WORKSPACE_FOLDER\"" | xargs -r docker rm -f 2>/dev/null || true
4549
46-
devcontainer up --workspace-folder "$(pwd)" --config "${{ parameters.configPath }}"
47-
devcontainer exec --workspace-folder "$(pwd)" --config "${{ parameters.configPath }}" \
50+
devcontainer up --workspace-folder "$WORKSPACE_FOLDER" --config "${{ parameters.configPath }}"
51+
cd "$WORKSPACE_FOLDER"
52+
devcontainer exec --workspace-folder "$WORKSPACE_FOLDER" --config "${{ parameters.configPath }}" \
4853
bash -c '${{ parameters.command }}'
4954
fi
5055
displayName: 'Run devcontainer'

0 commit comments

Comments
 (0)