|
@@ -3,34 +3,24 @@ package seecoder.devcloud.core.pipeline.handler;
|
|
|
import com.spotify.docker.client.ProgressHandler;
|
|
import com.spotify.docker.client.ProgressHandler;
|
|
|
import com.spotify.docker.client.exceptions.DockerException;
|
|
import com.spotify.docker.client.exceptions.DockerException;
|
|
|
import com.spotify.docker.client.messages.ProgressMessage;
|
|
import com.spotify.docker.client.messages.ProgressMessage;
|
|
|
-import io.kubernetes.client.openapi.models.*;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.io.FileUtils;
|
|
import org.apache.commons.io.FileUtils;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.eclipse.jgit.api.Git;
|
|
import org.eclipse.jgit.api.Git;
|
|
|
-import org.eclipse.jgit.api.ResetCommand;
|
|
|
|
|
-import org.eclipse.jgit.api.errors.GitAPIException;
|
|
|
|
|
-import org.springframework.core.io.ResourceLoader;
|
|
|
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
|
|
import org.springframework.util.ResourceUtils;
|
|
import org.springframework.util.ResourceUtils;
|
|
|
-import seecoder.devcloud.api.ApplicationProperties;
|
|
|
|
|
import seecoder.devcloud.api.docker.DockerApi;
|
|
import seecoder.devcloud.api.docker.DockerApi;
|
|
|
import seecoder.devcloud.api.git.GitApi;
|
|
import seecoder.devcloud.api.git.GitApi;
|
|
|
-import seecoder.devcloud.api.gitlab.GitlabApi;
|
|
|
|
|
-import seecoder.devcloud.common.exceptions.Asserts;
|
|
|
|
|
import seecoder.devcloud.common.util.SpringUtil;
|
|
import seecoder.devcloud.common.util.SpringUtil;
|
|
|
import seecoder.devcloud.core.pipeline.Context;
|
|
import seecoder.devcloud.core.pipeline.Context;
|
|
|
-import seecoder.devcloud.core.pipeline.Handler;
|
|
|
|
|
import seecoder.devcloud.core.pipeline.PipelineException;
|
|
import seecoder.devcloud.core.pipeline.PipelineException;
|
|
|
import seecoder.devcloud.core.pipeline.template.PipelineTemplateTable;
|
|
import seecoder.devcloud.core.pipeline.template.PipelineTemplateTable;
|
|
|
|
|
|
|
|
-import java.io.*;
|
|
|
|
|
|
|
+import java.io.File;
|
|
|
|
|
+import java.io.IOException;
|
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Files;
|
|
|
import java.nio.file.Path;
|
|
import java.nio.file.Path;
|
|
|
import java.nio.file.Paths;
|
|
import java.nio.file.Paths;
|
|
|
-import java.time.LocalDateTime;
|
|
|
|
|
-import java.util.*;
|
|
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
|
+import java.util.Date;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* @author PuHong Weng
|
|
* @author PuHong Weng
|
|
@@ -42,14 +32,11 @@ public class DockerImageBuildHandler extends AbstractHandler {
|
|
|
|
|
|
|
|
private static final String TEMP_PREFIX = "SEECODER-DEVCLOUD-";
|
|
private static final String TEMP_PREFIX = "SEECODER-DEVCLOUD-";
|
|
|
|
|
|
|
|
- public DockerApi dockerApi;
|
|
|
|
|
|
|
+ public final DockerApi dockerApi;
|
|
|
|
|
|
|
|
- public GitlabApi gitlabApi;
|
|
|
|
|
-
|
|
|
|
|
- public GitApi gitApi;
|
|
|
|
|
|
|
+ public final GitApi gitApi;
|
|
|
|
|
|
|
|
public DockerImageBuildHandler() {
|
|
public DockerImageBuildHandler() {
|
|
|
- gitlabApi = SpringUtil.getBean(GitlabApi.class);
|
|
|
|
|
dockerApi = SpringUtil.getBean(DockerApi.class);
|
|
dockerApi = SpringUtil.getBean(DockerApi.class);
|
|
|
gitApi = SpringUtil.getBean(GitApi.class);
|
|
gitApi = SpringUtil.getBean(GitApi.class);
|
|
|
}
|
|
}
|