From 22100ce260d7c23995e85b5f146a774b45a84623 Mon Sep 17 00:00:00 2001
From: "@mazikiou" <mazikiou@takima.fr>
Date: Wed, 10 Aug 2022 15:51:55 +0200
Subject: [PATCH] fix: path to .ssh
---
Dockerfile.desktop | 2 +-
deadlock-plugins/deadlock-extension/src/core/gitMission.ts | 4 ++--
.../src/core/mission/missionDevContainer.ts | 2 +-
start.desktop.sh | 5 -----
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Dockerfile.desktop b/Dockerfile.desktop
index 42c02bef..c8c8d922 100644
--- a/Dockerfile.desktop
+++ b/Dockerfile.desktop
@@ -20,7 +20,7 @@ RUN sed -e '$s/ash/bash/' /etc/passwd
COPY start.desktop.sh .
RUN chmod 500 start.desktop.sh
-RUN mkdir /project && mkdir /tmp/.ssh && mkdir /home/deadlock/mission
+RUN mkdir /project && mkdir /deadlock/.ssh && mkdir /home/deadlock/mission
RUN chown deadlock:deadlock /home/deadlock
diff --git a/deadlock-plugins/deadlock-extension/src/core/gitMission.ts b/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
index 12eb5c78..b7169e67 100644
--- a/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/gitMission.ts
@@ -45,7 +45,7 @@ export default class GitMission {
async setupSshAgent() {
try {
const gitea = await ApiService.instance.getGiteaPublicProperties();
- await exec(`ssh-add /tmp/.ssh/id_rsa`);
+ await exec(`ssh-add /deadlock/.ssh/id_rsa`);
await exec(`eval "$(ssh-agent -s)" && ssh-keyscan -p ${gitea.sshPort} -H ${gitea.sshHost} >> ~/.ssh/known_hosts`);
} catch (err) {
this.log(err);
@@ -62,7 +62,7 @@ export default class GitMission {
}
async forgetSshKeys() {
- await exec(`ssh-add -d /tmp/.ssh/id_rsa`);
+ await exec(`ssh-add -d /deadlock/.ssh/id_rsa`);
}
async getAuthor(): Promise<string> {
diff --git a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
index e47003ce..aeee0973 100644
--- a/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/mission/missionDevContainer.ts
@@ -108,7 +108,7 @@ export class MissionDevContainer {
private async setupMounts() {
this.mounts.splice(0, this.mounts.length);
this.mounts.push(
- `source=${userSshKeyFolderPath},target=/tmp/.ssh,type=bind,consistency=cached,readonly`,
+ `source=${userSshKeyFolderPath},target=/deadlock/.ssh,type=bind,consistency=cached,readonly`,
`source=${UserMission.getMissionUserFolder(
this.missionId,
this.revieweeId,
diff --git a/start.desktop.sh b/start.desktop.sh
index 135010df..71ac9954 100644
--- a/start.desktop.sh
+++ b/start.desktop.sh
@@ -3,11 +3,6 @@
ON_START_UP_FILE="/deadlock/startup.sh"
TAG="[DEADLOCK]"
-# setup ssh key for root user
-# must be installed by the API first within /tmp/.ssh
-mkdir ~/.ssh
-cp /tmp/.ssh/* ~/.ssh/
-
# start init mission script if exists
if [ -f "$ON_START_UP_FILE" ]; then
echo
--
GitLab