Merge remote-tracking branch 'origin/2.0' into 2.0

Former-commit-id: 838077afc7c9234664b8918b35c372335a160da8

adaptor/PCM-CORE/api/internal/config/config.go

@@ -40,7 +40,8 @@ type Config struct {
 		Endpoint  string
 	}
 
-	DockerConf struct {
+	RegistryConf struct {
-		Host string
+		Username string
+		Password string
 	}
 }

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",
+		Username: svcCtx.Config.RegistryConf.Username,
-		Password: "Nudt@123",
+		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)

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
+        - name: sock-volume
-            hostPath:
+          hostPath:
-              path: /var/run/docker.sock
+            path: /var/run/docker.sock
-              type: FileOrCreate
       restartPolicy: Always
       terminationGracePeriodSeconds: 30
       dnsPolicy: ClusterFirst