diff --git a/adaptor/PCM-CORE/api/internal/config/config.go b/adaptor/PCM-CORE/api/internal/config/config.go index de16da22..8ffc6adb 100644 --- a/adaptor/PCM-CORE/api/internal/config/config.go +++ b/adaptor/PCM-CORE/api/internal/config/config.go @@ -40,7 +40,8 @@ type Config struct { Endpoint string } - DockerConf struct { - Host string + RegistryConf struct { + Username string + Password string } } diff --git a/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go b/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go index 5299dbef..bc3bd297 100644 --- a/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go +++ b/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go @@ -164,15 +164,15 @@ func pushImage(svcCtx *svc.ServiceContext, hash string, name string) error { } // 推送镜像到registry authConfig := types2.AuthConfig{ - Username: "jointcloudNudt", - Password: "Nudt@123", + Username: svcCtx.Config.RegistryConf.Username, + Password: svcCtx.Config.RegistryConf.Password, } authConfigBytes, err := json.Marshal(authConfig) if err != nil { logx.Error(err) return err } - println(fmt.Sprintln("传输开始", time.Now())) + logx.Infof(fmt.Sprintln("传输开始", time.Now())) authStr := base64.URLEncoding.EncodeToString(authConfigBytes) pushBody, err := svcCtx.DockerClient.ImagePush(context.Background(), privateImageName, types2.ImagePushOptions{RegistryAuth: authStr}) pushBytes, _ := ioutil.ReadAll(pushBody)