Compare commits
3 Commits
8f9ffa0667
...
d5b893d9de
Author | SHA1 | Date |
---|---|---|
Roxie Gibson | d5b893d9de | |
Roxie Gibson | b143b544b6 | |
Roxie Gibson | 6df08df509 |
|
@ -188,7 +188,7 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
|
|||
logrus.Fatal(err)
|
||||
}
|
||||
|
||||
image := reference.Path(img.(reference.Named))
|
||||
image := reference.Path(img)
|
||||
regVersions, err := client.GetRegistryTags(image)
|
||||
if err != nil {
|
||||
logrus.Fatal(err)
|
||||
|
@ -263,7 +263,9 @@ This is step 1 of upgrading a recipe. Step 2 is running "abra recipe sync
|
|||
logrus.Fatal(err)
|
||||
}
|
||||
|
||||
config.UpdateAppComposeTag(recipe, image, upgradeTag)
|
||||
if err := config.UpdateAppComposeTag(recipe, image, upgradeTag); err != nil {
|
||||
logrus.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
|
|
|
@ -34,7 +34,7 @@ func GetRegistryTags(image string) (RawTags, error) {
|
|||
|
||||
// getRegv2Token retrieves a registry v2 authentication token.
|
||||
func getRegv2Token(image reference.Named) (string, error) {
|
||||
img := reference.Path(image.(reference.Named))
|
||||
img := reference.Path(image)
|
||||
authTokenURL := fmt.Sprintf("https://auth.docker.io/token?service=registry.docker.io&scope=repository:%s:pull", img)
|
||||
req, err := http.NewRequest("GET", authTokenURL, nil)
|
||||
if err != nil {
|
||||
|
@ -75,7 +75,7 @@ func getRegv2Token(image reference.Named) (string, error) {
|
|||
|
||||
// GetTagDigest retrieves an image digest from a v2 registry
|
||||
func GetTagDigest(image reference.Named) (string, error) {
|
||||
img := reference.Path(image.(reference.Named))
|
||||
img := reference.Path(image)
|
||||
tag := image.(reference.NamedTagged).Tag()
|
||||
manifestURL := fmt.Sprintf("https://index.docker.io/v2/%s/manifests/%s", img, tag)
|
||||
|
||||
|
|
|
@ -268,7 +268,7 @@ func UpdateAppComposeTag(recipe, image, tag string) error {
|
|||
logrus.Fatal(err)
|
||||
}
|
||||
|
||||
composeImage := reference.Path(img.(reference.Named))
|
||||
composeImage := reference.Path(img)
|
||||
if strings.Contains(composeImage, "library") {
|
||||
// ParseNormalizedNamed prepends 'library' to images like nginx:<tag>,
|
||||
// postgres:<tag>, i.e. images which do not have a username in the
|
||||
|
|
|
@ -74,11 +74,7 @@ func (t Tag) IsGreaterThan(tag Tag) bool {
|
|||
// take into account here, shorter is bigger (i.e. 2.1 < 2.1.1 == false, 2 <
|
||||
// 2.1 == false).
|
||||
func (t Tag) IsLessThan(tag Tag) bool {
|
||||
if t.IsGreaterThan(tag) {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
return !t.IsGreaterThan(tag)
|
||||
}
|
||||
|
||||
// Equals tests Tag equality
|
||||
|
@ -106,11 +102,7 @@ func (t Tag) Equals(tag Tag) bool {
|
|||
|
||||
p1, _ := strconv.Atoi(t.Patch)
|
||||
p2, _ := strconv.Atoi(tag.Patch)
|
||||
if p1 != p2 {
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
return p1 == p2
|
||||
}
|
||||
|
||||
// String formats a Tag correctly in string representation
|
||||
|
|
Loading…
Reference in New Issue