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 6eb85a12..bc3bd297 100644 --- a/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go +++ b/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go @@ -149,7 +149,7 @@ func pushImage(svcCtx *svc.ServiceContext, hash string, name string) error { return err } //time.Sleep(12 * 100 * time.Millisecond) - privateImageName := "hub.jcce.dev:18445/repository/docker-hub/" + name + privateImageName := "registry.cn-hangzhou.aliyuncs.com/jointcloud/pcm:" + name // 给镜像打上私有仓库的tag err = svcCtx.DockerClient.ImageTag(context.Background(), name, privateImageName) if err != nil { @@ -164,15 +164,15 @@ func pushImage(svcCtx *svc.ServiceContext, hash string, name string) error { } // 推送镜像到registry authConfig := types2.AuthConfig{ - Username: "admin", - 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) diff --git a/deploy/pcm-core-deployment.yaml b/deploy/pcm-core-deployment.yaml index ddeb3a83..d9720e7c 100644 --- a/deploy/pcm-core-deployment.yaml +++ b/deploy/pcm-core-deployment.yaml @@ -36,15 +36,14 @@ spec: - mountPath: /home/uploads name: pcm-image-storage - mountPath: /var/run/docker.sock - name: docker-sock-volume + name: sock-volume volumes: - name: pcm-image-storage persistentVolumeClaim: claimName: pcm-image-storage - - name: docker-sock-volume - hostPath: - path: /var/run/docker.sock - type: FileOrCreate + - name: sock-volume + hostPath: + path: /var/run/docker.sock restartPolicy: Always terminationGracePeriodSeconds: 30 dnsPolicy: ClusterFirst