diff --git a/modules/docker/docker_api.go b/modules/docker/docker_api.go
index 83006e5239..8e3b313b10 100644
--- a/modules/docker/docker_api.go
+++ b/modules/docker/docker_api.go
@@ -126,16 +126,15 @@ func GetAllMappedPort(cli *client.Client, containerID string) (string, error) {
func PushImage(dockerHost string, username string, password string, registryUrl string, imageRef string) error {
script := "docker " + "-H " + dockerHost + " login -u " + username + " -p " + password + " " + registryUrl + " "
cmd := exec.Command("sh", "-c", script)
- output, err := cmd.CombinedOutput()
- log.Info(string(output))
+ _, err := cmd.CombinedOutput()
if err != nil {
return err
}
// 推送到仓库
script = "docker " + "-H " + dockerHost + " push " + imageRef
cmd = exec.Command("sh", "-c", script)
- output, err = cmd.CombinedOutput()
- log.Info(string(output))
+ _, err = cmd.CombinedOutput()
+
if err != nil {
return err
}
@@ -248,7 +247,6 @@ func CreateAndStartContainer(cli *client.Client, opts *CreateDevcontainerOptions
},
PortBindings: opts.PortBindings,
}
- log.Info("%v", opts.PortBindings)
if len(opts.Binds) > 0 {
hostConfig.Binds = opts.Binds
}
diff --git a/routers/web/devcontainer/devcontainer.go b/routers/web/devcontainer/devcontainer.go
index 8e7ed5060d..70342a9ac6 100644
--- a/routers/web/devcontainer/devcontainer.go
+++ b/routers/web/devcontainer/devcontainer.go
@@ -101,7 +101,7 @@ func GetRepoDevContainerDetails(ctx *context.Context) {
ctx.Data["HasValidDevContainerJSON"] = isValidRepoDevcontainerJson
ctx.Data["Repository"] = ctx.Repo.Repository
ctx.Data["ContextUser"] = ctx.Doer
- ctx.Data["CreateDevcontainerSettingUrl"] = "/" + ctx.Doer.Name + "/" + ctx.Repo.Repository.Name + "/dev-container/createConfiguration"
+ ctx.Data["CreateDevcontainerSettingUrl"] = "/" + ctx.ContextUser.Name + "/" + ctx.Repo.Repository.Name + "/dev-container/createConfiguration"
ctx.Data["EditDevcontainerConfigurationUrl"] = ctx.Repo.RepoLink + "/_edit/" + ctx.Repo.Repository.DefaultBranch + "/.devcontainer/devcontainer.json"
ctx.Data["TreeNames"] = []string{".devcontainer", "devcontainer.json"}
ctx.Data["TreePaths"] = []string{".devcontainer", ".devcontainer/devcontainer.json"}
@@ -204,7 +204,6 @@ func UpdateRepoDevContainerForCurrentActor(ctx *context.Context) {
ctx.JSON(400, map[string]string{"message": "输入错误"})
return
}
- log.Info(updateInfo.SaveMethod + "asdafgsa")
opts := &devcontainer_service.UpdateDevcontainerOptions{
ImageName: updateInfo.ImageName,
PassWord: updateInfo.PassWord,
diff --git a/services/devcontainer/devcontainer.go b/services/devcontainer/devcontainer.go
index 7a58d71c71..f99e2ad56d 100644
--- a/services/devcontainer/devcontainer.go
+++ b/services/devcontainer/devcontainer.go
@@ -342,7 +342,6 @@ func GetWebTerminalURL(ctx context.Context, devcontainerName string) (string, er
func Get_IDE_TerminalURL(ctx *gitea_context.Context, devcontainer *RepoDevContainer) (string, error) {
var access_token string
defalut_ctx := context.Background()
- log.Info("%v", devcontainer)
// 获取端口号
cli, err := docker.CreateDockerClient(&defalut_ctx)
if err != nil {
diff --git a/services/devcontainer/devcontainer_json.go b/services/devcontainer/devcontainer_json.go
index 86139b054c..c9d86db677 100644
--- a/services/devcontainer/devcontainer_json.go
+++ b/services/devcontainer/devcontainer_json.go
@@ -34,6 +34,7 @@ type DevStarJSON struct {
}
func CreateDevcontainerJSON(ctx *gitea_context.Context) {
+ log.Info("%v %v", ctx.Repo.Repository, ctx.Doer)
jsonString := `{
"image":"mcr.microsoft.com/devcontainers/base:dev-ubuntu-20.04",
"forwardPorts": [
@@ -55,7 +56,7 @@ func CreateDevcontainerJSON(ctx *gitea_context.Context) {
"8888:8888"
]
}`
- resp, err := files_service.ChangeRepoFiles(db.DefaultContext, ctx.Repo.Repository, ctx.Doer, &files_service.ChangeRepoFilesOptions{
+ _, err := files_service.ChangeRepoFiles(db.DefaultContext, ctx.Repo.Repository, ctx.Doer, &files_service.ChangeRepoFilesOptions{
Files: []*files_service.ChangeRepoFile{
{
Operation: "create",
@@ -67,7 +68,7 @@ func CreateDevcontainerJSON(ctx *gitea_context.Context) {
NewBranch: "main",
Message: "add container configuration",
})
- log.Info(resp.Commit.URL)
+ //log.Info(resp.Commit.URL)
if err != nil {
log.Info("error ChangeRepoFiles:", err)
ctx.JSON(500, map[string]string{
diff --git a/services/devcontainer/docker_agent.go b/services/devcontainer/docker_agent.go
index 7cf82a10a9..e7b8015d3a 100644
--- a/services/devcontainer/docker_agent.go
+++ b/services/devcontainer/docker_agent.go
@@ -532,6 +532,7 @@ func DockerRestartContainer(gitea_ctx *gitea_web_context.Context, opts *RepoDevC
devContainerJson, err := GetDevcontainerJsonModel(*gitea_ctx, gitea_ctx.Repo.Repository)
cmd := []string{
"/usr/bin/ttyd/ttyd/ttyd -W -w " + opts.DevContainerWorkDir + " bash & ",
+ "service ssh restart",
}
postCreateCommand := append(cmd, devContainerJson.PostCreateCommand...)
// 创建 exec 实例
diff --git a/templates/repo/devcontainer/details.tmpl b/templates/repo/devcontainer/details.tmpl
index 16f2a8f3bf..89de9892f6 100644
--- a/templates/repo/devcontainer/details.tmpl
+++ b/templates/repo/devcontainer/details.tmpl
@@ -52,8 +52,8 @@
{{if .InitializedContainer}}
-
-
+
+