Skip to content

The Unified and Autonomous Development Platform

Detect server url correctly in docker and kubernetes environments

Steved29c6e5d03cd
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 0546b5b193..21b6f553a6 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -6,7 +6,9 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.List;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -20,6 +22,8 @@ import io.onedev.commons.launcher.loader.AbstractPlugin;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStarting;
@@ -39,7 +43,7 @@ import io.onedev.server.util.schedule.TaskScheduler;
public class OneDev extends AbstractPlugin implements Serializable {
public static final String NAME = "OneDev";
-
+
private static final Logger logger = LoggerFactory.getLogger(OneDev.class);
private final JettyRunner jettyRunner;
@@ -120,20 +124,125 @@ public class OneDev extends AbstractPlugin implements Serializable {
}
public String guessServerUrl() {
- String hostName;
- try {
- hostName = InetAddress.getLocalHost().getHostName();
- } catch (UnknownHostException e) {
- throw new RuntimeException(e);
- }
+ String serverUrl = null;
- String serverUrl;
- if (serverConfig.getHttpPort() != 0)
- serverUrl = "http://" + hostName + ":" + serverConfig.getHttpPort();
- else
- serverUrl = "https://" + hostName + ":" + serverConfig.getHttpsPort();
+ String serviceHost = System.getenv("ONEDEV_SERVICE_HOST");
+ if (serviceHost != null) { // we are running inside Kubernetes
+ Commandline kubectl = new Commandline("kubectl");
+ kubectl.addArgs("get", "service", "onedev", "-o",
+ "jsonpath={.status.loadBalancer.ingress[0].ip}");
+ AtomicReference<String> externalIpRef = new AtomicReference<>(null);
+ kubectl.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ externalIpRef.set(line);
+ }
+
+ }, new LineConsumer() {
- return StringUtils.stripEnd(serverUrl, "/");
+ @Override
+ public void consume(String line) {
+ logger.warn(line);
+ }
+
+ }).checkReturnCode();
+
+ if (externalIpRef.get() != null) {
+ kubectl.clearArgs();
+ kubectl.addArgs("get", "service", "onedev", "-o",
+ "jsonpath={range .spec.ports[*]}{.name} {.port}{'\\n'}{end}");
+ AtomicReference<String> httpPortRef = new AtomicReference<>(null);
+ AtomicReference<String> httpsPortRef = new AtomicReference<>(null);
+ kubectl.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ String protocol = StringUtils.substringBefore(line, " ");
+ if (protocol.equals("http"))
+ httpPortRef.set(StringUtils.substringAfter(line, " "));
+ else if (protocol.equals("https"))
+ httpsPortRef.set(StringUtils.substringAfter(line, " "));
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.warn(line);
+ }
+
+ }).checkReturnCode();
+
+ serverUrl = buildServerUrl(externalIpRef.get(), httpPortRef.get(), httpsPortRef.get());
+ }
+
+ if (serverUrl == null) {
+ String httpPort = System.getenv("ONEDEV_SERVICE_PORT_HTTP");
+ String httpsPort = System.getenv("ONEDEV_SERVICE_PORT_HTTPS");
+ serverUrl = buildServerUrl(serviceHost, httpPort, httpsPort);
+ }
+ }
+
+ if (serverUrl == null) {
+ AtomicReference<String> ipRef = new AtomicReference<>(null);
+ if (Bootstrap.isInDocker()) {
+ Commandline cmd = new Commandline("ip");
+ cmd.addArgs("route");
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.startsWith("default")) {
+ StringTokenizer tokenizer = new StringTokenizer(line);
+ tokenizer.nextToken();
+ tokenizer.nextToken();
+ ipRef.set(tokenizer.nextToken());
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+ }
+
+ if (ipRef.get() == null) {
+ try {
+ ipRef.set(InetAddress.getLocalHost().getHostName());
+ } catch (UnknownHostException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ if (serverConfig.getHttpPort() != 0)
+ serverUrl = "http://" + ipRef.get() + ":" + serverConfig.getHttpPort();
+ else
+ serverUrl = "https://" + ipRef.get() + ":" + serverConfig.getHttpsPort();
+ }
+
+ return serverUrl;
+ }
+
+ private String buildServerUrl(String host, @Nullable String httpPort, @Nullable String httpsPort) {
+ String serverUrl = null;
+ if (httpPort != null) {
+ serverUrl = "http://" + host;
+ if (!httpPort.equals("80"))
+ serverUrl += ":" + httpPort;
+ } else if (httpsPort != null) {
+ serverUrl = "https://" + host;
+ if (!httpsPort.equals("443"))
+ serverUrl += ":" + httpsPort;
+ } else {
+ logger.warn("This OneDev deployment looks odd to me: "
+ + "both http and https port are not specified");
+ }
+ return serverUrl;
}
/**
diff --git a/server-core/src/main/java/io/onedev/server/git/config/GitConfig.java b/server-core/src/main/java/io/onedev/server/git/config/GitConfig.java
index 052e2fbf6a..e8a8d3d785 100644
--- a/server-core/src/main/java/io/onedev/server/git/config/GitConfig.java
+++ b/server-core/src/main/java/io/onedev/server/git/config/GitConfig.java
@@ -20,7 +20,7 @@ import io.onedev.server.web.editable.annotation.Editable;
public abstract class GitConfig implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
-
+
/**
* Get git executable, for instance <tt>/usr/bin/git</tt>.
*
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 36bb7eb291..57e27ea758 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -4,6 +4,8 @@ import java.io.File;
import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -112,7 +114,8 @@ public class DefaultDataManager implements DataManager, Serializable {
administrator = new User();
administrator.setId(User.ROOT_ID);
Set<String> excludedProperties = Sets.newHashSet("administrator", "canCreateProjects");
- manualConfigs.add(new ManualConfig("Create Root Account", null, administrator, excludedProperties) {
+ manualConfigs.add(new ManualConfig("Create Administrator Account", null,
+ administrator, excludedProperties) {
@Override
public Skippable getSkippable() {
@@ -125,7 +128,6 @@ public class DefaultDataManager implements DataManager, Serializable {
user.setPassword(passwordService.encryptPassword(user.getPassword()));
userManager.save(user, null);
idManager.init(User.class);
- roleManager.setupDefaults();
}
});
@@ -137,12 +139,17 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null || setting.getValue() == null) {
systemSetting = new SystemSetting();
systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());
- } else {
- if (!validator.validate(setting.getValue()).isEmpty())
- systemSetting = (SystemSetting) setting.getValue();
+ } else if (!validator.validate(setting.getValue()).isEmpty()) {
+ systemSetting = (SystemSetting) setting.getValue();
}
if (systemSetting != null) {
- manualConfigs.add(new ManualConfig("Specify System Setting", null, systemSetting) {
+ Collection<String> excludedProps = new HashSet<>();
+ if (Bootstrap.isInDocker()) {
+ excludedProps.add("gitConfig");
+ excludedProps.add("curlConfig");
+ }
+ manualConfigs.add(new ManualConfig("Specify System Setting", null,
+ systemSetting, excludedProps) {
@Override
public Skippable getSkippable() {
@@ -231,6 +238,9 @@ public class DefaultDataManager implements DataManager, Serializable {
});
}
+ if (roleManager.count() == 0)
+ roleManager.setupDefaults();
+
return manualConfigs;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index 7d945193a0..23bce75242 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -31,9 +31,8 @@ public class SystemSetting implements Serializable, Validatable {
private boolean gravatarEnabled = true;
- @Editable(name="Server URL", order=90, description="Specify root URL to access this server. For instance, "
- + "<i>http://server-dns-name:8810</i>. Build jobs running in Kubernetes cluster will access this "
- + "url to download source and artifacts")
+ @Editable(name="Server URL", order=90, description="Specify root URL to access this server. Build jobs "
+ + "running in Kubernetes cluster will access this url to download source and artifacts")
@NotEmpty
public String getServerUrl() {
return serverUrl;
@@ -66,7 +65,7 @@ public class SystemSetting implements Serializable, Validatable {
this.curlConfig = curlConfig;
}
- @Editable(order=300, description="Whether or not to enable user gravatar.")
+ @Editable(order=300, description="Whether or not to enable user gravatar (https://gravatar.com)")
public boolean isGravatarEnabled() {
return gravatarEnabled;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java b/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
index e84f284c02..cc1c8ee939 100644
--- a/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
+++ b/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
@@ -1,8 +1,8 @@
package io.onedev.server.util.init;
import java.io.Serializable;
+import java.util.Collection;
import java.util.HashSet;
-import java.util.Set;
import javax.annotation.Nullable;
@@ -15,9 +15,10 @@ public abstract class ManualConfig implements Serializable {
private final Serializable setting;
- private final Set<String> excludedProperties;
+ private final Collection<String> excludedProperties;
- public ManualConfig(String title, @Nullable String description, Serializable setting, Set<String> excludedProperties) {
+ public ManualConfig(String title, @Nullable String description, Serializable setting,
+ Collection<String> excludedProperties) {
this.title = title;
this.description = description;
this.setting = setting;
@@ -40,7 +41,7 @@ public abstract class ManualConfig implements Serializable {
return setting;
}
- public Set<String> getExcludeProperties() {
+ public Collection<String> getExcludeProperties() {
return excludedProperties;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java
index 4cd210b176..ea4d91956c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java
@@ -1,8 +1,13 @@
package io.onedev.server.web.page.admin.systemsetting;
+import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.SystemSetting;
@@ -34,7 +39,12 @@ public class SystemSettingPage extends AdministrationPage {
}
};
- form.add(BeanContext.edit("editor", systemSetting));
+ Collection<String> excludedProps = new HashSet<>();
+ if (new File(Bootstrap.installDir, "IN_DOCKER").exists()) {
+ excludedProps.add("gitConfig");
+ excludedProps.add("curlConfig");
+ }
+ form.add(BeanContext.edit("editor", systemSetting, excludedProps, true));
add(form);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
index 2a65662ab1..bcb5a99037 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java
@@ -42,7 +42,8 @@ public class ServerInitPage extends BasePage {
final ManualConfig lastConfig = clonedConfigs.remove(clonedConfigs.size()-1);
- clonedConfigs.add(new ManualConfig(lastConfig.getTitle(), null, lastConfig.getSetting()) {
+ clonedConfigs.add(new ManualConfig(lastConfig.getTitle(), lastConfig.getDescription(),
+ lastConfig.getSetting(), lastConfig.getExcludeProperties()) {
@Override
public Skippable getSkippable() {
diff --git a/server-product/build/docker/Dockerfile b/server-product/build/docker/Dockerfile
index b6de1dc0f8..5977749112 100644
--- a/server-product/build/docker/Dockerfile
+++ b/server-product/build/docker/Dockerfile
@@ -2,6 +2,6 @@ FROM ubuntu:18.04
COPY onedev /app
COPY entrypoint.sh idle.sh /root/bin/
COPY kubectl /usr/local/bin/
-RUN apt-get update && apt-get install -y curl git openjdk-8-jre-headless
+RUN apt-get update && apt-get install -y iproute2 curl git openjdk-8-jre-headless
EXPOSE 6610
CMD ["/root/bin/entrypoint.sh"]
diff --git a/server-product/build/docker/entrypoint.sh b/server-product/build/docker/entrypoint.sh
index 7fee84094b..da34359ba2 100755
--- a/server-product/build/docker/entrypoint.sh
+++ b/server-product/build/docker/entrypoint.sh
@@ -17,6 +17,7 @@ trap _sigint SIGINT
child=$!
wait "$child"
+touch /opt/onedev/IN_DOCKER
/opt/onedev/boot/wrapper-linux-x86-64 /opt/onedev/conf/wrapper.conf &
child=$!
wait "$child"
diff --git a/server-product/build/docker/run.sh b/server-product/build/docker/run.sh
index b5083449eb..51df1d9ab1 100755
--- a/server-product/build/docker/run.sh
+++ b/server-product/build/docker/run.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout -f ../pom.xml)
+buildVersion=$(mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout -f ../../pom.xml)
docker run -it --rm -v /var/run/docker.sock:/var/run/docker.sock -v $(which docker):/usr/bin/docker -v /opt/onedev:/opt/onedev -p 6610:6610 1dev/server:${buildVersion}