diff --git a/deadlock-plugins/deadlock-extension/CHANGELOG.md b/deadlock-plugins/deadlock-extension/CHANGELOG.md index b55368d979f0b0c8b38114eab51365fddf147493..19d3b66a0fec5be4b3d052651976ea0ce4f4c1bd 100644 --- a/deadlock-plugins/deadlock-extension/CHANGELOG.md +++ b/deadlock-plugins/deadlock-extension/CHANGELOG.md @@ -4,9 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -#### [v0.1.12](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/v1.0.1...v0.1.12) +#### [0.1.13](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/0.1.12...0.1.13) -### [v1.0.1](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/0.1.11...v1.0.1) +- feat: integrated authentication view in Deadlock panel [`feedc85`](https://gitlab.takima.io/deadlock-public/deadlock-desktop/commit/feedc85fd1cc1ed13f3129f3afbcf700f46a291d) +- feat: submit code to api [`bf2644d`](https://gitlab.takima.io/deadlock-public/deadlock-desktop/commit/bf2644d18ef0cb05acd3882c0a7e851bc3f6872d) +- feat: make initial commit after structure init [`94968e6`](https://gitlab.takima.io/deadlock-public/deadlock-desktop/commit/94968e6f1483059dbb45946821d7342cf33d0405) + +#### [0.1.12](https://gitlab.takima.io/deadlock-public/deadlock-desktop/compare/0.1.11...0.1.12) > 7 July 2022 diff --git a/deadlock-plugins/deadlock-extension/package-lock.json b/deadlock-plugins/deadlock-extension/package-lock.json index 7bc3265b5a6f05bc4e4556d53902e2caba09d2c2..c4bee32c52c8f83bbf6887226ad03dbdcb1d3522 100644 --- a/deadlock-plugins/deadlock-extension/package-lock.json +++ b/deadlock-plugins/deadlock-extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "deadlock-coding", - "version": "0.1.12", + "version": "0.1.13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "deadlock-coding", - "version": "0.1.12", + "version": "0.1.13", "dependencies": { "@types/tar": "^6.1.1", "@vscode/webview-ui-toolkit": "^1.0.0", diff --git a/deadlock-plugins/deadlock-extension/package.json b/deadlock-plugins/deadlock-extension/package.json index 71379b35d871c2059d71185e5a3a0762dc87c4de..b5204d7d9d41454f25bae153edaaa5fb1f4a1fa5 100644 --- a/deadlock-plugins/deadlock-extension/package.json +++ b/deadlock-plugins/deadlock-extension/package.json @@ -1,7 +1,7 @@ { "name": "deadlock-coding", "description": "Deadlock Coding", - "version": "0.1.12", + "version": "0.1.13", "publisher": "Deadlock", "icon": "media/logo.png", "engines": { diff --git a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts index d76607bdd8310afb98a0304a8865d3d9dde4565f..951eb6a573f0425aaef612804612e8477a360495 100644 --- a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts +++ b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts @@ -149,11 +149,11 @@ export class MissionDevContainer { mounts: this.mounts, userEnvProbe: 'interactiveShell', settings: defaultSettings, - overrideCommand: true, + overrideCommand: false, shutdownAction: 'stopContainer', workspaceMount: `source=${this.dirs.mounted},target=${remoteMissionDir},type=bind`, workspaceFolder: `${remoteMissionDir}`, - onCreateCommand: `cp -R ${remoteGiteaWorkDir}/* ${remoteMissionDir} && sudo bash /start.desktop.sh`, + onCreateCommand: `cp -R ${remoteGiteaWorkDir}/* ${remoteMissionDir}`, runArgs: ['--name', containerName, '--privileged'], ...options, }; diff --git a/start.desktop.sh b/start.desktop.sh index 52da9506201c937695f468a47f8f7bae3224a823..135010df39b1f6109edc9e25157437b598ca5baa 100644 --- a/start.desktop.sh +++ b/start.desktop.sh @@ -3,9 +3,6 @@ ON_START_UP_FILE="/deadlock/startup.sh" TAG="[DEADLOCK]" -# Start docker in docker -dockerd-entrypoint.sh "$@" & - # setup ssh key for root user # must be installed by the API first within /tmp/.ssh mkdir ~/.ssh @@ -22,3 +19,6 @@ else echo "$TAG No startup script found." echo fi + +# Start docker in docker +sudo dockerd-entrypoint.sh "$@"