From c9f3fa1d979a831a8e9ae9515b83760b270804cb Mon Sep 17 00:00:00 2001
From: Alexandra <apuret@takima.fr>
Date: Wed, 23 Feb 2022 15:31:37 +0100
Subject: [PATCH] feat: prefix path instead of suffix for hosts
---
Dockerfile | 2 +-
deadlock-plugins/deadlock-extension/src/core/userConfig.ts | 2 +-
deadlock-plugins/deadlock-extension/src/view/briefingView.ts | 2 +-
deadlock-plugins/java/install.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 29b766a6..9d10f801 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.e-biz.fr/deadlock-public/theia:1.201
+FROM theia:1.22.1
USER root
diff --git a/deadlock-plugins/deadlock-extension/src/core/userConfig.ts b/deadlock-plugins/deadlock-extension/src/core/userConfig.ts
index 34fa4c07..21f1d3ea 100644
--- a/deadlock-plugins/deadlock-extension/src/core/userConfig.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/userConfig.ts
@@ -7,7 +7,7 @@
* "3000":"HXW3fnKwUULrfKS1-web",
* "8080":"HXW3fnKwUULrfKS1-angular"
* },
- * "host":"persist.dev.deadlock.io",
+ * "host":"dev.deadlock.io",
* "token":"e75da487-9576-4427-be2d-8da4059adc7d",
* "giteaHost":"deadlock.minikube",
* "giteaSshPort":32000,
diff --git a/deadlock-plugins/deadlock-extension/src/view/briefingView.ts b/deadlock-plugins/deadlock-extension/src/view/briefingView.ts
index 6da57e16..b3e86b95 100644
--- a/deadlock-plugins/deadlock-extension/src/view/briefingView.ts
+++ b/deadlock-plugins/deadlock-extension/src/view/briefingView.ts
@@ -123,7 +123,7 @@ export default class BriefingView extends WebviewBase {
if (userConfig.getHost() === 'localhost') {
adresses += `<li>${key} binded on <a href="http://${userConfig.getHost()}:${path}">${path}</a></li>`;
} else {
- adresses += `<li>${key} binded on <a href="https://${userConfig.getHost()}/${path}/">${path}</a></li>`;
+ adresses += `<li>${key} binded on <a href="https://${path}.${userConfig.getHost()}">${path}</a></li>`;
}
}
}
diff --git a/deadlock-plugins/java/install.sh b/deadlock-plugins/java/install.sh
index bb4ee328..9b703612 100755
--- a/deadlock-plugins/java/install.sh
+++ b/deadlock-plugins/java/install.sh
@@ -2,7 +2,7 @@
set -e
-VERSION=0.21.0
+VERSION=0.20.0
NAME="vscode-java-pack"
--
GitLab