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

pull/4954/head
ssongliu 7 months ago committed by GitHub
parent 76356eaf5b
commit d5c75f4eee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -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,8 +373,7 @@ 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,
@ -385,7 +384,6 @@ func (u *ImageService) ImagePush(req dto.ImagePush) (string, error) {
} }
authStr := base64.URLEncoding.EncodeToString(encodedJSON) authStr := base64.URLEncoding.EncodeToString(encodedJSON)
options.RegistryAuth = authStr 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 {

Loading…
Cancel
Save