The Unified and Autonomous Development Platform
Fix issue #438 - OneDev upgrade does not work if server is terminated forcibly
Robin Shena580ccd36ace
diff --git a/pom.xml b/pom.xmlindex 6d1ceec993..ea34e10cd4 100644--- a/pom.xml+++ b/pom.xml@@ -9,7 +9,7 @@<version>1.0.5</version></parent><artifactId>server</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>@@ -52,7 +52,7 @@<plugin><groupId>io.onedev</groupId><artifactId>plugin-maven</artifactId>- <version>2.0.6</version>+ <version>2.0.7</version><executions><execution><?m2e execute onConfiguration,onIncremental?>@@ -563,8 +563,8 @@</repository></repositories><properties>- <commons.version>2.0.16</commons.version>- <agent.version>1.1.3</agent.version>+ <commons.version>2.0.18</commons.version>+ <agent.version>1.1.5</agent.version><slf4j.version>1.7.30</slf4j.version><logback.version>1.2.0</logback.version><antlr.version>4.7.2</antlr.version>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 8093219d35..e072fcd0cd 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.javaindex 6414bd25ee..3fe1352b76 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java@@ -1,19 +1,15 @@package io.onedev.server.buildspec.job;import java.io.Serializable;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.codeassist.InputSuggestion;-import io.onedev.k8shelper.KubernetesHelper;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.util.validation.annotation.RegEx;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;-import io.onedev.server.web.util.SuggestionUtils;@Editablepublic class CacheSpec implements Serializable {@@ -39,7 +35,7 @@ public class CacheSpec implements Serializable {@Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "+ "Specify \".\" (without quote) to cache workspace itself. "+ "<span class='text-warning'>Absolute path is not allowed if the job is executed by a shell executor</span>")- @Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestPaths")+ @Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getPath() {return path;@@ -49,13 +45,6 @@ public class CacheSpec implements Serializable {this.path = path;}- @SuppressWarnings("unused")- private static List<InputSuggestion> suggestPaths(String matchWith) {- Map<String, String> candidates = new LinkedHashMap<>();- candidates.put(KubernetesHelper.HOME_PREFIX, "Path under user home");- return SuggestionUtils.suggest(candidates, matchWith);- }-@SuppressWarnings("unused")private static List<InputSuggestion> suggestVariables(String matchWith) {return BuildSpec.suggestVariables(matchWith, false, false);diff --git a/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java b/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.javaindex fee3d179a0..6c22601d9b 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/ApplyDatabaseConstraints.java@@ -39,7 +39,7 @@ public class ApplyDatabaseConstraints extends DefaultPersistManager {@Overridepublic void start() {- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {+ if (isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before applying db constraints");System.exit(1);}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.javaindex 5c93b01a32..7acad68000 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java@@ -51,7 +51,7 @@ public class BackupDatabase extends DefaultPersistManager {System.exit(1);}- if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {+ if (isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {logger.error("Please stop server before backing up database");System.exit(1);}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java b/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.javaindex 0cb531fe8d..b14d2b13e4 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/CheckDataVersion.java@@ -34,7 +34,7 @@ public class CheckDataVersion extends DefaultPersistManager {@Overridepublic void start() {- if (Bootstrap.isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {+ if (isServerRunning(Bootstrap.installDir) && isHSQLDialect(getDialect())) {logger.error("Please stop server before checking data version");System.exit(1);}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.javaindex de90ed68e8..72edf84db3 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/CleanDatabase.java@@ -35,7 +35,7 @@ public class CleanDatabase extends DefaultPersistManager {@Overridepublic void start() {- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {+ if (isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before cleaning database");System.exit(1);}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.javaindex 8dd17704fd..4084389525 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/ResetAdminPassword.java@@ -47,7 +47,7 @@ public class ResetAdminPassword extends DefaultPersistManager {logger.error("Missing password parameter. Usage: {} <new password>", Bootstrap.command.getScript());System.exit(1);}- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {+ if (isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before resetting admin password");System.exit(1);}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.javaindex f8f442575b..08257daf1c 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java@@ -53,7 +53,7 @@ public class RestoreDatabase extends DefaultPersistManager {logger.info("Restoring database from {}...", backupFile.getAbsolutePath());- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {+ if (isServerRunning(Bootstrap.installDir)) {logger.error("Please stop server before restoring");System.exit(1);}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.javaindex 3497e0a460..b36ba901c4 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/Upgrade.java@@ -179,12 +179,8 @@ public class Upgrade extends DefaultPersistManager {if (oldAppVersion == null || !oldAppVersion.equals(AppLoader.getProduct().getVersion())) {logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());- if (Bootstrap.isServerRunning(upgradeDir)) {- logger.error("Please stop server running at \"{}\" before upgrading", upgradeDir.getAbsolutePath());- System.exit(1);- }- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {- logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());+ if (isServerRunning(upgradeDir) || isServerRunning(Bootstrap.installDir)) {+ logger.error("Please stop server before upgrading");System.exit(1);}@@ -203,6 +199,10 @@ public class Upgrade extends DefaultPersistManager {}}+ File statusDir = new File(upgradeDir, "status");+ if (statusDir.exists())+ FileUtils.cleanDir(statusDir);+AtomicInteger oldDataVersion = new AtomicInteger(0);int ret = buildCommandline(upgradeDir, "check-data-version").execute(new LineConsumer() {@@ -264,7 +264,7 @@ public class Upgrade extends DefaultPersistManager {logger.info("Backing up database as {}...", dbBackupFile.getAbsolutePath());FileUtils.createDir(dbBackupFile.getParentFile());-+ret = buildCommandline(upgradeDir, "backup-db", dbBackupFile.getAbsolutePath()).execute(new LineConsumer() {@Override@@ -286,6 +286,7 @@ public class Upgrade extends DefaultPersistManager {FileUtils.deleteDir(new File(upgradeDir, "sampledb"), 3);} else {logger.info("Cleaning database with old program...");+ret = buildCommandline(upgradeDir, "clean-db").execute(new LineConsumer() {@Override@@ -395,13 +396,14 @@ public class Upgrade extends DefaultPersistManager {} else {logger.info("Populating {}...", upgradeDir.getAbsolutePath());- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {- logger.error("Please stop server running at \"{}\" before populating", Bootstrap.installDir.getAbsolutePath());+ if (isServerRunning(Bootstrap.installDir)) {+ logger.error("Please stop server before populating");System.exit(1);}try {FileUtils.copyDirectory(Bootstrap.installDir, upgradeDir);+ FileUtils.cleanDir(new File(upgradeDir, "logs"));restoreExecutables(upgradeDir);logger.info("Successfully populated {}", upgradeDir.getAbsolutePath());System.exit(0);@@ -418,36 +420,38 @@ public class Upgrade extends DefaultPersistManager {File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");for (File file: Bootstrap.getBinDir().listFiles()) {- try {- String serverScript = null;- if (file.getName().equals("server.sh")) {- String siteRunAsUserLine = null;- for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {- if (line.contains("RUN_AS_USER")) {- siteRunAsUserLine = line;- break;- }- }- if (siteRunAsUserLine != null) {- String newRunAsUserLine = null;- for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {+ if (!file.getName().endsWith(".pid") && !file.getName().endsWith(".status")) {+ try {+ String serverScript = null;+ if (file.getName().equals("server.sh")) {+ String siteRunAsUserLine = null;+ for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {if (line.contains("RUN_AS_USER")) {- newRunAsUserLine = line;+ siteRunAsUserLine = line;break;}}- if (newRunAsUserLine != null) {- serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());- serverScript = StringUtils.replace(serverScript, newRunAsUserLine, siteRunAsUserLine);+ if (siteRunAsUserLine != null) {+ String newRunAsUserLine = null;+ for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {+ if (line.contains("RUN_AS_USER")) {+ newRunAsUserLine = line;+ break;+ }+ }+ if (newRunAsUserLine != null) {+ serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());+ serverScript = StringUtils.replace(serverScript, newRunAsUserLine, siteRunAsUserLine);+ }}}+ if (serverScript != null)+ FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());+ else+ FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));+ } catch (IOException e) {+ throw new RuntimeException(e);}- if (serverScript != null)- FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());- else- FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));- } catch (IOException e) {- throw new RuntimeException(e);}}@@ -468,16 +472,21 @@ public class Upgrade extends DefaultPersistManager {if (new File(upgradeDir, "bin/reset_admin_password.sh").exists())FileUtils.deleteFile(new File(upgradeDir, "bin/reset_admin_password.sh"));+ FileUtils.deleteDir(new File(upgradeDir, "status"));+cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));+ cleanAndCopy(new File(Bootstrap.installDir, "agent"), new File(upgradeDir, "agent"));if (new File(upgradeDir, "boot/system.classpath").exists())FileUtils.deleteFile(new File(upgradeDir, "boot/system.classpath"));cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));for (File file: new File(Bootstrap.getSiteDir(), "avatars").listFiles()) {- try {- FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));- } catch (IOException e) {- throw new RuntimeException(e);+ if (file.isFile()) {+ try {+ FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}}File uploadedDir = new File(upgradeDir, "site/avatars/uploaded");@@ -507,6 +516,8 @@ public class Upgrade extends DefaultPersistManager {"io.onedev.commons.launcher.bootstrap.Bootstrap");wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.commons.launcher.bootstrap.Bootstrap","io.onedev.commons.bootstrap.Bootstrap");+ wrapperConf = StringUtils.replace(wrapperConf, "wrapper.pidfile=../status/onedev.pid", "");+FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, StandardCharsets.UTF_8);File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex 7491738d24..1839c917e1 100644--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -4,6 +4,7 @@ import java.io.File;import java.io.FilenameFilter;import java.io.IOException;import java.lang.reflect.Field;+import java.net.ServerSocket;import java.nio.charset.Charset;import java.sql.Connection;import java.sql.Driver;@@ -111,6 +112,19 @@ public class DefaultPersistManager implements PersistManager {return dialect.trim().equals("org.hibernate.dialect.HSQLDialect");}+ protected boolean isServerRunning(File installDir) {+ Properties props = FileUtils.loadProperties(new File(installDir, "conf/server.properties"));+ int sshPort = Integer.parseInt(props.get("ssh_port").toString());+ try (ServerSocket serverSocket = new ServerSocket(sshPort)) {+ return false;+ } catch (IOException e) {+ if (e.getMessage() != null && e.getMessage().contains("Address already in use"))+ return true;+ else+ throw new RuntimeException(e);+ }+ }+protected void execute(List<String> sqls, boolean failOnError) {try ( Connection conn = getConnection();Statement stmt = conn.createStatement();) {diff --git a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.javaindex ab869b0783..84b31657a7 100644--- a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java+++ b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java@@ -12,6 +12,7 @@ import org.apache.sshd.server.auth.pubkey.CachingPublicKeyAuthenticator;import org.apache.sshd.server.command.Command;import org.apache.sshd.server.shell.UnknownCommand;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.Listen;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;@@ -59,11 +60,13 @@ public class SshServerLauncher {return new UnknownCommand(command);});- try {- server.start();- } catch (IOException e) {- throw new RuntimeException(e);- }+ if (Bootstrap.command == null) {+ try {+ server.start();+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }}@Listendiff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.javaindex 1538fdcc32..7469b15aab 100644--- a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java@@ -105,7 +105,6 @@ public class AgentResource extends AbstractResource {}FileUtils.touchFile(new File(agentDir, "agent/conf/attributes.properties"));FileUtils.touchFile(new File(agentDir, "agent/logs/console.log"));- FileUtils.touchFile(new File(agentDir, "agent/status/do_not_remove.txt"));Collection<String> agentLibs = OneDev.getInstance(AgentManager.class).getAgentLibs();diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 3df89b83ec..b17943cd57 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex c7375aa46d..f675be1fae 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><build><resources>diff --git a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xmlindex 3841a2ccd9..53dccc091f 100644--- a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml+++ b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml@@ -114,7 +114,7 @@<plugin><groupId>io.onedev</groupId><artifactId>plugin-maven</artifactId>- <version>2.0.6</version>+ <version>2.0.7</version><executions><execution><id>populate-resources</id>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex d2634447e8..1ee37be565 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex b9f846a3fc..a09da93a08 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex 8aeef7eef1..379daf31a8 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 87e08a1ce9..cfb7578362 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 77c50e724b..391107fba5 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex f735477b17..0fa540c58f 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex a90e52022b..034745af93 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex 1a5817b61a..055e9e8600 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.javaindex f08c5144b2..66247fca3f 100644--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java@@ -277,8 +277,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDafor (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {if (!PathUtils.isCurrent(entry.getValue())) {String each = entry.getKey().getDirectory(hostCacheHome).getAbsolutePath();- for (String containerCachePath: KubernetesHelper.resolveCachePath(containerWorkspace, entry.getValue()))- docker.addArgs("-v", getOuterPath(each) + ":" + containerCachePath);+ String containerCachePath = PathUtils.resolve(containerWorkspace, entry.getValue());+ docker.addArgs("-v", getOuterPath(each) + ":" + containerCachePath);}}diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex acee774fdd..2d3758f8c0 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.javaindex 11001e0211..b45b8fdcf0 100644--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java@@ -133,8 +133,6 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatFile userDir = new File(buildDir, "user");FileUtils.createDir(userDir);- Map<String, String> environments = new HashMap<>();- environments.put("HOME", userDir.getAbsolutePath());jobContext.reportJobWorkspace(workspaceDir.getAbsolutePath());@@ -175,7 +173,7 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatfor (Map.Entry<CacheInstance, String> entry: cacheAllocations.entrySet()) {if (!PathUtils.isCurrent(entry.getValue())) {File sourceDir = entry.getKey().getDirectory(cacheHomeDir);- File destDir = resolveCachePath(workspaceDir, userDir, entry.getValue());+ File destDir = resolveCachePath(workspaceDir, entry.getValue());if (destDir.exists())FileUtils.deleteDir(destDir);else@@ -189,6 +187,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat}Commandline shell = getShell();+ Map<String, String> environments = new HashMap<>();+ environments.put("GIT_HOME", userDir.getAbsolutePath());shell.workingDir(workspaceDir).environments(environments);shell.addArgs(jobScriptFile.getAbsolutePath());@@ -203,6 +203,8 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDatjobLogger.log("Checking out code...");Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());git.workingDir(workspaceDir);+ Map<String, String> environments = new HashMap<>();+ environments.put("HOME", userDir.getAbsolutePath());git.environments(environments);CloneInfo cloneInfo = checkoutExecutable.getCloneInfo();diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex e735ddf1c6..22ea6b0a65 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex ec75b27b97..a77606d51f 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex 44d8274679..05d67770a6 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex 9495c1f00f..ea11159d00 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex 99ae2684f6..869dc39312 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex 5ae750c3ca..b62e15a850 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex c1899248fd..bc5ccf4b9e 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex 3da3cc039b..cbc731774d 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex d1e08633fe..81b26c8f4c 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex bc1b88d60a..e6a9b8a72a 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex 489560aaa4..020b5ec776 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 72991293ca..3b0ab19bf1 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 762b402f54..2ce3a99cfd 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 1fef1ba41e..c8b359e096 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 4e881ae419..6b9fffbe44 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex 29798e46a5..9d105e1001 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex 40016b9049..b2bf977d6b 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex a65ba22c53..e733335fcc 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex 0c413f9b8b..5d37a12c44 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-product/docker/entrypoint.sh b/server-product/docker/entrypoint.shindex 1368e36f10..8eba121608 100755--- a/server-product/docker/entrypoint.sh+++ b/server-product/docker/entrypoint.sh@@ -15,7 +15,7 @@ _sigint() {trap _sigterm SIGTERMtrap _sigint SIGINT-/app/boot/wrapper-linux-x86-64 /app/conf/wrapper.conf wrapper.pidfile=/app/status/onedev_upgrade.pid -- upgrade /opt/onedev &+/app/boot/wrapper-linux-x86-64 /app/conf/wrapper.conf -- upgrade /opt/onedev &child=$!wait "$child"diff --git a/server-product/jsw/App.sh.in b/server-product/jsw/App.sh.inindex 57affb9bc2..cb861c16d0 100644--- a/server-product/jsw/App.sh.in+++ b/server-product/jsw/App.sh.in@@ -66,7 +66,7 @@ WRAPPER_CONF="../conf/wrapper.conf"PRIORITY=# Location of the pid file.-PIDDIR="../status"+PIDDIR="."# PIDFILE_CHECK_PID tells the script to double check whether the pid in the pid# file actually exists and belongs to this application. When not set, onlydiff --git a/server-product/jsw/agent/App.sh.in b/server-product/jsw/agent/App.sh.inindex 24ab04f82f..a490824c0f 100644--- a/server-product/jsw/agent/App.sh.in+++ b/server-product/jsw/agent/App.sh.in@@ -66,7 +66,7 @@ WRAPPER_CONF="../conf/wrapper.conf"PRIORITY=# Location of the pid file.-PIDDIR="../status"+PIDDIR="."# PIDFILE_CHECK_PID tells the script to double check whether the pid in the pid# file actually exists and belongs to this application. When not set, onlydiff --git a/server-product/jsw/agent/wrapper.conf b/server-product/jsw/agent/wrapper.confindex 320c3f908e..37b74ddeef 100644--- a/server-product/jsw/agent/wrapper.conf+++ b/server-product/jsw/agent/wrapper.conf@@ -35,7 +35,6 @@wrapper.lang.folder=../langwrapper.restart.reload_configuration=TRUE-wrapper.pidfile=../status/onedevagent.pidwrapper.single_invocation=TRUE#********************************************************************diff --git a/server-product/jsw/wrapper.conf b/server-product/jsw/wrapper.confindex cc66c15d7e..79a65a8be1 100644--- a/server-product/jsw/wrapper.conf+++ b/server-product/jsw/wrapper.conf@@ -35,7 +35,6 @@wrapper.lang.folder=../langwrapper.restart.reload_configuration=TRUE-wrapper.pidfile=../status/onedev.pidwrapper.single_invocation=TRUE#********************************************************************diff --git a/server-product/pom.xml b/server-product/pom.xmlindex ffb86dbae6..21881b5a5f 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>5.3.1</version>+ <version>5.3.3</version></parent><dependencies><dependency>diff --git a/server-product/system/status/do_not_remove.txt b/server-product/system/status/do_not_remove.txtdeleted file mode 100644index e69de29bb2..0000000000