Skip to content

The Unified and Autonomous Development Platform

Fix issue #244 - Cannot bring up production on Kubernetes

Robin Shenf4d5b79230d7
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index 01f5c55a65..2f08c1bc02 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -210,26 +210,26 @@ public class OneDev extends AbstractPlugin implements Serializable {
} else {
serverUrl = buildServerUrl(externalIp, "http", httpPort);
}
- }
-
- if (serverUrl == null) {
- String httpPortEnv = System.getenv("ONEDEV_SERVICE_PORT_HTTP");
- String httpsPortEnv = System.getenv("ONEDEV_SERVICE_PORT_HTTPS");
- String sshPortEnv = System.getenv("ONEDEV_SERVICE_PORT_SSH");
-
- Integer httpPort = httpPortEnv!=null?Integer.valueOf(httpPortEnv):null;
- Integer httpsPort = httpsPortEnv!=null?Integer.valueOf(httpsPortEnv):null;
- Integer sshPort = sshPortEnv!=null?Integer.valueOf(sshPortEnv):null;
- if (ssh) {
- if (sshPort != null)
- serverUrl = buildServerUrl(externalIp, "ssh", sshPort);
- } else if (httpsPort != null) {
- serverUrl = buildServerUrl(externalIp, "https", httpsPort);
- } else {
- serverUrl = buildServerUrl(externalIp, "http", httpPort);
+ if (serverUrl == null) {
+ String httpPortEnv = System.getenv("ONEDEV_SERVICE_PORT_HTTP");
+ String httpsPortEnv = System.getenv("ONEDEV_SERVICE_PORT_HTTPS");
+ String sshPortEnv = System.getenv("ONEDEV_SERVICE_PORT_SSH");
+
+ httpPort = httpPortEnv!=null?Integer.valueOf(httpPortEnv):null;
+ httpsPort = httpsPortEnv!=null?Integer.valueOf(httpsPortEnv):null;
+ sshPort = sshPortEnv!=null?Integer.valueOf(sshPortEnv):null;
+
+ if (ssh) {
+ if (sshPort != null)
+ serverUrl = buildServerUrl(externalIp, "ssh", sshPort);
+ } else if (httpsPort != null) {
+ serverUrl = buildServerUrl(externalIp, "https", httpsPort);
+ } else {
+ serverUrl = buildServerUrl(externalIp, "http", httpPort);
+ }
}
- }
+ }
}
if (serverUrl == null) {