From c8f3eff9f2bb76d9bbb56202b4c3644cad3e58cd Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 7 Jul 2023 15:47:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=82=E8=BD=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 426cab62bab1f9e76806c479c8c03fbdda2da65e --- deploy/pcm-core-deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/pcm-core-deployment.yaml b/deploy/pcm-core-deployment.yaml index ddeb3a83..2d8bd29b 100644 --- a/deploy/pcm-core-deployment.yaml +++ b/deploy/pcm-core-deployment.yaml @@ -36,12 +36,12 @@ 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: path: /var/run/docker.sock type: FileOrCreate From 202a89ed182f9716be2805710711783184adb910 Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 7 Jul 2023 15:55:13 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=82=E8=BD=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 9c3325b8f4fa4a4e8d4900831c54e96aa60762e0 --- deploy/pcm-core-deployment.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/pcm-core-deployment.yaml b/deploy/pcm-core-deployment.yaml index 2d8bd29b..cfc8d3ac 100644 --- a/deploy/pcm-core-deployment.yaml +++ b/deploy/pcm-core-deployment.yaml @@ -42,9 +42,9 @@ spec: persistentVolumeClaim: claimName: pcm-image-storage - name: sock-volume - hostPath: - path: /var/run/docker.sock - type: FileOrCreate + hostPath: + path: /var/run/docker.sock + type: FileOrCreate restartPolicy: Always terminationGracePeriodSeconds: 30 dnsPolicy: ClusterFirst From 33415610e9584dc6ca9e133b3132f80dbeedfc1a Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 7 Jul 2023 16:02:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=82=E8=BD=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: fba1807a5d7e59b4fad7012c6acc457eeea9bcf8 --- deploy/pcm-core-deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/deploy/pcm-core-deployment.yaml b/deploy/pcm-core-deployment.yaml index cfc8d3ac..d9720e7c 100644 --- a/deploy/pcm-core-deployment.yaml +++ b/deploy/pcm-core-deployment.yaml @@ -44,7 +44,6 @@ spec: - name: sock-volume hostPath: path: /var/run/docker.sock - type: FileOrCreate restartPolicy: Always terminationGracePeriodSeconds: 30 dnsPolicy: ClusterFirst From 1f15bad31be0d83cd7e8390d563a19dae179a3e3 Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 7 Jul 2023 16:29:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: fdd81a6b333816d434a8e1bde6be625c8a5f6ee9 --- adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go b/adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go index 6eb85a12..5299dbef 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,7 +164,7 @@ func pushImage(svcCtx *svc.ServiceContext, hash string, name string) error { } // 推送镜像到registry authConfig := types2.AuthConfig{ - Username: "admin", + Username: "jointcloudNudt", Password: "Nudt@123", } authConfigBytes, err := json.Marshal(authConfig) From 3795fc64aa85e55012e54253049bdb0ab1592138 Mon Sep 17 00:00:00 2001 From: zhangwei <894646498@qq.com> Date: Fri, 7 Jul 2023 16:46:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: ec6172833842042d3d17c04462781730def61af3 --- adaptor/PCM-CORE/api/internal/config/config.go | 5 +++-- adaptor/PCM-CORE/api/internal/handler/image/chunkhandler.go | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) 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)