Procházet zdrojové kódy

modify: 删除无用registry yaml配置,改为docker仓库配置

370774330@qq.com před 5 roky
rodič
revize
de9eed740a

+ 7 - 25
api/src/main/java/seecoder/devcloud/api/ApplicationProperties.java

@@ -32,8 +32,6 @@ public class ApplicationProperties {
 	@Valid
 	private K8s k8s = new K8s();
 	@Valid
-	private Registry registry = new Registry();
-	@Valid
 	private Git git = new Git();
 
 	@Data
@@ -79,10 +77,14 @@ public class ApplicationProperties {
 
 	@Data
 	public static class Docker {
-		@NotEmpty
-		private String host = "unix:///var/run/docker.sock";
-		@NotEmpty
+
+		private String host;
+
 		private String registry;
+
+		private String registryUsername;
+
+		private String registryPassword;
 	}
 
 	@Data
@@ -106,27 +108,7 @@ public class ApplicationProperties {
 		private Boolean validateSSL = false;
 
 		private Boolean debugging = false;
-	}
 
-	@Data
-	public static class Registry{
-		@NotEmpty
-		private String host;
-
-		@NotEmpty
-		private String username;
-
-		@NotEmpty
-		private String password;
-
-		@NotEmpty
-		private String nexusServer;
-
-        @NotEmpty
-        private String repoName = "sec-repo";
-
-		@NotEmpty
-		private String cleanUpTask = "4da7e1e1-2b28-46b5-a080-9d834cc96019";
 	}
 
 	@Data