gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-03-14 01:34:47 +08:00
Code

fix: 解决容器镜像推送失败的问题 (#4944)

Browse Source
This commit is contained in:
ssongliu 2024-05-09 22:00:24 +08:00 committed by GitHub
parent 76356eaf5b
commit d5c75f4eee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
backend/app/service/image.go
View File

@ -271,7 +271,7 @@ func (u *ImageService) ImagePull(req dto.ImagePull) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
options := types.ImagePullOptions{} options := image.PullOptions{}
if repo.Auth { if repo.Auth {
authConfig := registry.AuthConfig{ authConfig := registry.AuthConfig{
Username: repo.Username, Username: repo.Username,
@ -373,19 +373,17 @@ func (u *ImageService) ImagePush(req dto.ImagePush) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
options := types.ImagePushOptions{} options := image.PushOptions{All: true}
if repo.Auth { authConfig := registry.AuthConfig{
authConfig := registry.AuthConfig{ Username: repo.Username,
Username: repo.Username, Password: repo.Password,
Password: repo.Password,
}
encodedJSON, err := json.Marshal(authConfig)
if err != nil {
return "", err
}
authStr := base64.URLEncoding.EncodeToString(encodedJSON)
options.RegistryAuth = authStr
} }
encodedJSON, err := json.Marshal(authConfig)
if err != nil {
return "", err
}
authStr := base64.URLEncoding.EncodeToString(encodedJSON)
options.RegistryAuth = authStr
newName := fmt.Sprintf("%s/%s", repo.DownloadUrl, req.Name) newName := fmt.Sprintf("%s/%s", repo.DownloadUrl, req.Name)
if newName != req.TagName { if newName != req.TagName {
if err := client.ImageTag(context.TODO(), req.TagName, newName); err != nil { if err := client.ImageTag(context.TODO(), req.TagName, newName); err != nil {