The Unified and Autonomous Development Platform
chore: Add server url and access token as workspace envs so that it can be used by tod
Robin Shen95e1383e1fa5
diff --git a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.javaindex a28f535418..9c64eef9cf 100644--- a/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java+++ b/server-plugin/server-plugin-provisioner-docker/src/main/java/io/onedev/server/plugin/provisioner/docker/DockerProvisioner.java@@ -57,6 +57,7 @@ import io.onedev.server.model.support.administration.DockerAware;import io.onedev.server.model.support.administration.workspaceprovisioner.RegistryLogin;import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;import io.onedev.server.model.support.workspace.spec.EnvVar;+import io.onedev.server.service.SettingService;import io.onedev.server.terminal.CommandlineShell;import io.onedev.server.terminal.Shell;import io.onedev.server.terminal.Terminal;@@ -375,6 +376,9 @@ public class DockerProvisioner extends WorkspaceProvisioner implements DockerAwa.collect(toMap(EnvVar::getName, it -> it.isSecret() ? it.getSecretValue() : it.getValue()));envVars.put("TERM", "xterm-256color");envVars.put("LANG", "C.UTF-8");+ envVars.put("ONEDEV_SERVER_URL", OneDev.getInstance(SettingService.class).getSystemSetting().getServerUrl());+ envVars.put("ONEDEV_WORKSPACE_TOKEN", context.getToken());+envVars.put("ONEDEV_WORKDIR", CONTAINER_WORKSPACE_PATH + "/work");logger.log("Setting up cache...");diff --git a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.javaindex 26920c62fc..7d2b0f909d 100644--- a/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java+++ b/server-plugin/server-plugin-provisioner-shell/src/main/java/io/onedev/server/plugin/provisioner/shell/ShellProvisioner.java@@ -32,6 +32,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.Workspace;import io.onedev.server.model.support.administration.workspaceprovisioner.WorkspaceProvisioner;import io.onedev.server.model.support.workspace.spec.EnvVar;+import io.onedev.server.service.SettingService;import io.onedev.server.terminal.CommandlineShell;import io.onedev.server.terminal.Shell;import io.onedev.server.terminal.Terminal;@@ -129,6 +130,8 @@ public class ShellProvisioner extends WorkspaceProvisioner implements Testable<TenvVars.put("LANG", "C.UTF-8");var workDir = Workspace.getWorkDir(context.getProjectId(), context.getWorkspaceNumber());envVars.put("ONEDEV_WORKDIR", workDir.getAbsolutePath());+ envVars.put("ONEDEV_SERVER_URL", OneDev.getInstance(SettingService.class).getSystemSetting().getServerUrl());+ envVars.put("ONEDEV_WORKSPACE_TOKEN", context.getToken());logger.log("Setting up cache...");